diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-13 17:42:39 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-03-15 14:50:13 +0100 |
| commit | 7a96e87d6e58a07235a2bc3eff9b093af4937a72 (patch) | |
| tree | 41aca95f66517f0de234851764dfd3e4bde88469 /drivers/pcmcia | |
| parent | 7a410e8d4d97457c8c381e2de9cdc7bd3306badc (diff) | |
| download | linux-7a96e87d6e58a07235a2bc3eff9b093af4937a72.tar.bz2 | |
pcmcia: pd6729, i82092: use parent (PCI) resources
A newly added parent resource entry for the root PCI bus, such as
40000000-ffffffff : PCI Bus #00
means that the pd6729 and i82092 drivers cannot allocate iomem as
freely as before, unless they do so as PCI devices. Therefore, set
socket->cb_dev so that rsrc_nonstatic.c does the right thing.
Reported-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/i82092.c | 1 | ||||
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pcmcia/i82092.c b/drivers/pcmcia/i82092.c index a04f21c8170f..f5da62653313 100644 --- a/drivers/pcmcia/i82092.c +++ b/drivers/pcmcia/i82092.c @@ -133,6 +133,7 @@ static int __devinit i82092aa_pci_probe(struct pci_dev *dev, const struct pci_de sockets[i].socket.map_size = 0x1000; sockets[i].socket.irq_mask = 0; sockets[i].socket.pci_irq = dev->irq; + sockets[i].socket.cb_dev = dev; sockets[i].socket.owner = THIS_MODULE; sockets[i].number = i; diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 7c204910a777..7ba57a565cd7 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; |