Bladeren bron

[PATCH] i2o: Switch to pci_get API

Use the safe ref-counted API for the bridge check

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Alan Cox 18 jaren geleden
bovenliggende
commit
df10f4edd5
1 gewijzigde bestanden met toevoegingen van 4 en 3 verwijderingen
  1. 4 3
      drivers/message/i2o/pci.c

+ 4 - 3
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
 		 * Expose the ship behind i960 for initialization, or it will
 		 * failed
 		 * failed
 		 */
 		 */
-		i960 =
-		    pci_find_slot(c->pdev->bus->number,
+		i960 = pci_get_slot(c->pdev->bus,
 				  PCI_DEVFN(PCI_SLOT(c->pdev->devfn), 0));
 				  PCI_DEVFN(PCI_SLOT(c->pdev->devfn), 0));
 
 
-		if (i960)
+		if (i960) {
 			pci_write_config_word(i960, 0x42, 0);
 			pci_write_config_word(i960, 0x42, 0);
+			pci_dev_put(i960);
+		}
 
 
 		c->promise = 1;
 		c->promise = 1;
 		c->limit_sectors = 1;
 		c->limit_sectors = 1;