Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 15:58:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pcmcia: limit pxa2xx_trizeps4 subdriver to trizeps4 platform

Browse Source 
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>
This commit is contained in:
Dmitry Eremin-Solenikov 2011-04-01 13:28:46 +04:00 committed by Eric Miao
parent af21cbb1ef
commit 735443fede
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/pcmcia/pxa2xx_trizeps4.c
View File

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