projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
af21cbb
)
pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
author
Dmitry Eremin-Solenikov
<dbaryshkov@gmail.com>
Fri, 1 Apr 2011 09:28:46 +0000
(13:28 +0400)
committer
Eric Miao
<eric.y.miao@gmail.com>
Tue, 12 Apr 2011 15:07:42 +0000
(23:07 +0800)
pxa2xx_trizeps4 tries to register pxa2xx-pcmcia device not checking whether
machine is really trizeps4, thus messing multi-machine kernels. Fix it up.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
drivers/pcmcia/pxa2xx_trizeps4.c
patch
|
blob
|
history
diff --git
a/drivers/pcmcia/pxa2xx_trizeps4.c
b/drivers/pcmcia/pxa2xx_trizeps4.c
index
b7e5966
..
5bb4e1a
100644
(file)
--- a/
drivers/pcmcia/pxa2xx_trizeps4.c
+++ b/
drivers/pcmcia/pxa2xx_trizeps4.c
@@
-226,6
+226,9
@@
static int __init trizeps_pcmcia_init(void)
{
int ret;
+ if (!machine_is_trizeps4() && !machine_is_trizeps4wl())
+ return -ENODEV;
+
trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
if (!trizeps_pcmcia_device)
return -ENOMEM;