diff options
Diffstat (limited to 'drivers/pcmcia/sa1111_generic.c')
-rw-r--r-- | drivers/pcmcia/sa1111_generic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 59866905ea37..7d6d3d423ef0 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
@@ -141,9 +141,7 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops, | |||
141 | return -ENOMEM; | 141 | return -ENOMEM; |
142 | 142 | ||
143 | s->soc.nr = ops->first + i; | 143 | s->soc.nr = ops->first + i; |
144 | s->soc.ops = ops; | 144 | soc_pcmcia_init_one(&s->soc, ops, &dev->dev); |
145 | s->soc.socket.owner = ops->owner; | ||
146 | s->soc.socket.dev.parent = &dev->dev; | ||
147 | s->soc.socket.pci_irq = s->soc.nr ? | 145 | s->soc.socket.pci_irq = s->soc.nr ? |
148 | dev->irq[IDX_IRQ_S0_READY_NINT] : | 146 | dev->irq[IDX_IRQ_S0_READY_NINT] : |
149 | dev->irq[IDX_IRQ_S1_READY_NINT]; | 147 | dev->irq[IDX_IRQ_S1_READY_NINT]; |