From: Alan Cox Date: Sun, 1 Oct 2006 06:27:59 +0000 (-0700) Subject: [PATCH] i2o: Switch to pci_get API X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=df10f4edd5f097251c62f1d4a3adea778100b4a8;p=linux-beck.git [PATCH] i2o: Switch to pci_get API Use the safe ref-counted API for the bridge check Signed-off-by: Alan Cox Cc: Markus Lidel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 1b58444d5aaf..dec41cc89937 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c @@ -372,12 +372,13 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, * Expose the ship behind i960 for initialization, or it will * failed */ - i960 = - pci_find_slot(c->pdev->bus->number, + i960 = pci_get_slot(c->pdev->bus, PCI_DEVFN(PCI_SLOT(c->pdev->devfn), 0)); - if (i960) + if (i960) { pci_write_config_word(i960, 0x42, 0); + pci_dev_put(i960); + } c->promise = 1; c->limit_sectors = 1;