summaryrefslogtreecommitdiff
path: root/drivers/pcmcia/pxa2xx_lubbock.c
diff options
context:
space:
mode:
authorPavel Machek <pma@sysgo.com>2011-02-04 09:03:43 +0100
committerDominik Brodowski <linux@dominikbrodowski.net>2011-02-19 12:22:35 +0100
commit5b703683b6cc3cb97bbe6b1b14898b273eb59279 (patch)
tree54959d42d6a6005ebe5e2655e6bdb2d480fb4131 /drivers/pcmcia/pxa2xx_lubbock.c
parentd5bb2923cfa0a29c5854f9618703ff60849b949e (diff)
downloadlinux-5b703683b6cc3cb97bbe6b1b14898b273eb59279.tar.gz
pcmcia vs. MECR on pxa25x/sa1111
After 2.6.34 changes, __pxa2xx_drv_pcmcia_probe() was replaced by sa1111_pcmcia_add(). That unfortunately means that configure_sockets() is not called, leading to MECR not being set properly, leading to strange crashes. Tested on pxa255+sa1111, I do not have lubbock board nearby. Perhaps cleaner solution exists? Signed-off-by: Pavel Machek <pma@sysgo.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pxa2xx_lubbock.c')
-rw-r--r--drivers/pcmcia/pxa2xx_lubbock.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c
index b9f8c8fb42bd..25afe637c657 100644
--- a/drivers/pcmcia/pxa2xx_lubbock.c
+++ b/drivers/pcmcia/pxa2xx_lubbock.c
@@ -226,6 +226,7 @@ int pcmcia_lubbock_init(struct sa1111_dev *sadev)
lubbock_set_misc_wr((1 << 15) | (1 << 14), 0);
pxa2xx_drv_pcmcia_ops(&lubbock_pcmcia_ops);
+ pxa2xx_configure_sockets(&sadev->dev);
ret = sa1111_pcmcia_add(sadev, &lubbock_pcmcia_ops,
pxa2xx_drv_pcmcia_add_one);
}