pcmcia: pd6729, i82092: use parent (PCI) resources (7a96e87d) · Commits · 戴 / test

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>

drivers/pcmcia/i82092.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

drivers/pcmcia/pd6729.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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;

Admin message