diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 11:04:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 11:04:59 -0700 |
| commit | 1097d7cef683c30f9768007daae2e961a0686a10 (patch) | |
| tree | 1dc8f3fc26c6c4b9f5366e94cf4c20490f7f3203 /drivers/pcmcia/pd6729.c | |
| parent | 57b552ba0b2faf7cce66d476ef8ce7f6210c62fd (diff) | |
| parent | 4e06e240dcbb803433ee31bfe89a3e785a77cd3b (diff) | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
PCMCIA: resource, fix lock imbalance
pcmcia: add important if statement
pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary
pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket
pcmcia: honor saved flags in yenta_socket's I365_CSCINT register
pcmcia: revert "irq probe can be done without risking an IRQ storm"
pcmcia: pd6729, i82092: use parent (PCI) resources
pcmcia/vrc4171: use local spinlock for device local lock.
Diffstat (limited to 'drivers/pcmcia/pd6729.c')
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 7c204910a77..7ba57a565cd 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c @@ -671,6 +671,7 @@ static int __devinit pd6729_pci_probe(struct pci_dev *dev, socket[i].socket.map_size = 0x1000; socket[i].socket.irq_mask = mask; socket[i].socket.pci_irq = dev->irq; + socket[i].socket.cb_dev = dev; socket[i].socket.owner = THIS_MODULE; socket[i].number = i; |