Commit a7a5ac58 authored by Marc Zyngier's avatar Marc Zyngier Committed by Russell King

PCMCIA: fix pxa2xx_lubbock modular build error

Commit d0d26c33 broke the driver by
propagating a pointer to the platform_device where a pointer to the
generic device was expected, leading to a spectacular crash...
Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Acked-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
Acked-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d93626e8
...@@ -291,7 +291,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) ...@@ -291,7 +291,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
skt->nr = ops->first + i; skt->nr = ops->first + i;
skt->ops = ops; skt->ops = ops;
skt->socket.owner = ops->owner; skt->socket.owner = ops->owner;
skt->socket.dev.parent = dev; skt->socket.dev.parent = &dev->dev;
skt->socket.pci_irq = NO_IRQ; skt->socket.pci_irq = NO_IRQ;
ret = pxa2xx_drv_pcmcia_add_one(skt); ret = pxa2xx_drv_pcmcia_add_one(skt);
...@@ -304,8 +304,8 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) ...@@ -304,8 +304,8 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
soc_pcmcia_remove_one(&sinfo->skt[i]); soc_pcmcia_remove_one(&sinfo->skt[i]);
kfree(sinfo); kfree(sinfo);
} else { } else {
pxa2xx_configure_sockets(dev); pxa2xx_configure_sockets(&dev->dev);
dev_set_drvdata(dev, sinfo); dev_set_drvdata(&dev->dev, sinfo);
} }
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment