Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke...

[karo-tx-linux.git] / drivers / pcmcia / sa11xx_base.c

diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
index 4db81490e5c95c562ec7609d06f7572fb47ee5b6..fc9a6527019b033d21a3d234cc09b2d0c29b792d 100644 (file)
--- a/drivers/pcmcia/sa11xx_base.c
+++ b/drivers/pcmcia/sa11xx_base.c
@@ -235,11 +235,10 @@ int sa11xx_drv_pcmcia_probe(struct device *dev, struct pcmcia_low_level *ops,
                skt = &sinfo->skt[i];
 
                skt->nr = first + i;
-               skt->irq = NO_IRQ;
-               skt->dev = dev;
                skt->ops = ops;
                skt->socket.owner = ops->owner;
                skt->socket.dev.parent = dev;
+               skt->socket.pci_irq = NO_IRQ;
 
                ret = sa11xx_drv_pcmcia_add_one(skt);
                if (ret)