[PATCH 5/6] pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
From: Dmitry Eremin-Solenikov <hidden>
Date: 2011-01-05 02:05:09
Subsystem:
pcmcia subsystem, pxa2xx/pxa3xx support, the rest · Maintainers:
Dominik Brodowski, Daniel Mack, Haojian Zhuang, Robert Jarzmik, Linus Torvalds
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 <redacted> --- drivers/pcmcia/pxa2xx_trizeps4.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index b7e5966..5bb4e1a 100644
--- 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;
--
1.7.2.3