From ba6c07675c368cc1237198c053c1f6c13f1f8d4e Mon Sep 17 00:00:00 2001
From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Mon, 20 Apr 2009 17:48:28 +0100
Subject: [PATCH] --- yaml --- r: 144063 b: refs/heads/master c:
 ae1036a2f4e8f83b544ddce4f875a1e4e2ac7b62 h: refs/heads/master i:   144061:
 978ad2f5c93f54e1ab2b0949ce170daf8c4fc654   144059:
 ac63f4d2687b1f77d80efcfc339a253c425ddafd   144055:
 d533af8c2bc45680249b10db5ac66b61042da136   144047:
 fd309f89c8ba41740b45fd1a8bc220ea51706480   144031:
 e4e74045bfe8d052092611fdb63f6c6b163ebde4   143999:
 0dea0a9daf82894aa524809e37e90e1b7e6b8ff8 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/pcmcia/pxa2xx_sharpsl.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 87d453e531f9..017af8ac1c9d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64bd43a086469a0bfdd87e012523184bdd96ce81
+refs/heads/master: ae1036a2f4e8f83b544ddce4f875a1e4e2ac7b62
diff --git a/trunk/drivers/pcmcia/pxa2xx_sharpsl.c b/trunk/drivers/pcmcia/pxa2xx_sharpsl.c
index 1cd02f5a23a0..bc43f78f6f0b 100644
--- a/trunk/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/trunk/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -255,6 +255,9 @@ static int __init sharpsl_pcmcia_init(void)
 {
 	int ret;
 
+	if (!platform_scoop_config)
+		return -ENODEV;
+
 	sharpsl_pcmcia_ops.nr = platform_scoop_config->num_devs;
 	sharpsl_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);