git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
[sfrench/cifs-2.6.git]
/
drivers
/
pcmcia
/
pxa2xx_sharpsl.c
diff --git
a/drivers/pcmcia/pxa2xx_sharpsl.c
b/drivers/pcmcia/pxa2xx_sharpsl.c
index 1cd02f5a23a0e7cbc9de1156ab8a535e2b39e6fe..bc43f78f6f0ba10ae8caa184f76d96cb30389475 100644
(file)
--- a/
drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/
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);