From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Fri, 1 Apr 2011 09:28:46 +0000 (+0400)
Subject: pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform
X-Git-Tag: tegra-14.ER1-android-2.3~1140^2~4^2~4
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-2.6.git;a=commitdiff_plain;h=735443fede138fbbad062ec258e4d49648a0a56d

pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform

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>
---

diff --git a/drivers/pcmcia/pxa2xx_trizeps4.c b/drivers/pcmcia/pxa2xx_trizeps4.c
index b7e596620db..5bb4e1a94d2 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;