浏览代码

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>
Dmitry Eremin-Solenikov 14 年之前
父节点
当前提交
735443fede
共有 1 个文件被更改,包括 3 次插入0 次删除
  1. 3 0
      drivers/pcmcia/pxa2xx_trizeps4.c

+ 3 - 0
drivers/pcmcia/pxa2xx_trizeps4.c

@@ -226,6 +226,9 @@ static int __init trizeps_pcmcia_init(void)
 {
 {
 	int ret;
 	int ret;
 
 
+	if (!machine_is_trizeps4() && !machine_is_trizeps4wl())
+		return -ENODEV;
+
 	trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
 	trizeps_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
 	if (!trizeps_pcmcia_device)
 	if (!trizeps_pcmcia_device)
 		return -ENOMEM;
 		return -ENOMEM;