summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_lubbock.c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-10-29 01:42:56 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-10-29 01:42:56 +0400
commit9468613b2bb0a386af563953b613efc6c77bd8c1 (patch)
tree2181a22d0d4eca134adc9a091303aa6dabd98e91 /drivers/pcmcia/pxa2xx_lubbock.c
parent84b5abe69ff600a559e1a1fa29f1edad707d4e2f (diff)
downloadlinux-9468613b2bb0a386af563953b613efc6c77bd8c1.tar.xz
[ARM] Fix suspend oops caused by PXA2xx PCMCIA driver
The PXA2xx PCMCIA driver was registering a device_driver with the platform_bus_type. Unfortunately, this causes data outside the device_driver structure to be dereferenced as if it were a platform_driver structure, causing an oops. Convert the PXA2xx core driver to use the proper platform_driver structure. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_lubbock.c')
-rw-r--r--drivers/pcmcia/pxa2xx_lubbock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c
index fd1f691c7c2c..a92f11143c43 100644
--- a/drivers/pcmcia/pxa2xx_lubbock.c
+++ b/drivers/pcmcia/pxa2xx_lubbock.c
@@ -260,7 +260,7 @@ int __init pcmcia_lubbock_init(struct sa1111_dev *sadev)
lubbock_set_misc_wr((1 << 15) | (1 << 14), 0);
sadev->dev.platform_data = &lubbock_pcmcia_ops;
- ret = pxa2xx_drv_pcmcia_probe(&sadev->dev);
+ ret = __pxa2xx_drv_pcmcia_probe(&sadev->dev);
}
return ret;