diff options
Diffstat (limited to 'drivers')
| -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) | |||
| 291 | skt->nr = ops->first + i; | 291 | skt->nr = ops->first + i; |
| 292 | skt->ops = ops; | 292 | skt->ops = ops; |
| 293 | skt->socket.owner = ops->owner; | 293 | skt->socket.owner = ops->owner; |
| 294 | skt->socket.dev.parent = dev; | 294 | skt->socket.dev.parent = &dev->dev; |
| 295 | skt->socket.pci_irq = NO_IRQ; | 295 | skt->socket.pci_irq = NO_IRQ; |
| 296 | 296 | ||
| 297 | ret = pxa2xx_drv_pcmcia_add_one(skt); | 297 | ret = pxa2xx_drv_pcmcia_add_one(skt); |
| @@ -304,8 +304,8 @@ static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev) | |||
| 304 | soc_pcmcia_remove_one(&sinfo->skt[i]); | 304 | soc_pcmcia_remove_one(&sinfo->skt[i]); |
| 305 | kfree(sinfo); | 305 | kfree(sinfo); |
| 306 | } else { | 306 | } else { |
| 307 | pxa2xx_configure_sockets(dev); | 307 | pxa2xx_configure_sockets(&dev->dev); |
| 308 | dev_set_drvdata(dev, sinfo); | 308 | dev_set_drvdata(&dev->dev, sinfo); |
| 309 | } | 309 | } |
| 310 | 310 | ||
| 311 | return ret; | 311 | return ret; |
