diff options
| author | Marc Zyngier <maz@misterjones.org> | 2009-12-15 21:11:21 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-16 20:11:02 +0000 |
| commit | a7a5ac58df0832daf7774b083c33032a7d26c792 (patch) | |
| tree | ca131e0237e6192551e2c36565976f91f65184d4 | |
| parent | d93626e861eaab387950ec34346961013ba28d5e (diff) | |
| download | blackbird-op-linux-a7a5ac58df0832daf7774b083c33032a7d26c792.tar.gz blackbird-op-linux-a7a5ac58df0832daf7774b083c33032a7d26c792.zip | |
PCMCIA: fix pxa2xx_lubbock modular build error
Commit d0d26c33b63c7ec10c3fdf9c7ce0aa035f0b3200 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: Marc Zyngier <maz@misterjones.org>
Acked-by: Dominik Brodowski <linux@dominikbrodowski.net>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 3aabf1e37988..76e640bccde8 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c @@ -291,7 +291,7 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) skt->nr = ops->first + i; skt->ops = ops; skt->socket.owner = ops->owner; - skt->socket.dev.parent = dev; + skt->socket.dev.parent = &dev->dev; skt->socket.pci_irq = NO_IRQ; ret = pxa2xx_drv_pcmcia_add_one(skt); @@ -304,8 +304,8 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) soc_pcmcia_remove_one(&sinfo->skt[i]); kfree(sinfo); } else { - pxa2xx_configure_sockets(dev); - dev_set_drvdata(dev, sinfo); + pxa2xx_configure_sockets(&dev->dev); + dev_set_drvdata(&dev->dev, sinfo); } return ret; |
