diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-10-01 02:27:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-01 03:39:23 -0400 |
commit | df10f4edd5f097251c62f1d4a3adea778100b4a8 (patch) | |
tree | b5f7ba2e0ed805de67f9a9774d982a08e4f291df | |
parent | 1aff0ecafb5e94515dc37849fd32a810554f34f4 (diff) |
[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>
-rw-r--r-- | drivers/message/i2o/pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
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, | |||
372 | * Expose the ship behind i960 for initialization, or it will | 372 | * Expose the ship behind i960 for initialization, or it will |
373 | * failed | 373 | * failed |
374 | */ | 374 | */ |
375 | i960 = | 375 | i960 = pci_get_slot(c->pdev->bus, |
376 | pci_find_slot(c->pdev->bus->number, | ||
377 | PCI_DEVFN(PCI_SLOT(c->pdev->devfn), 0)); | 376 | PCI_DEVFN(PCI_SLOT(c->pdev->devfn), 0)); |
378 | 377 | ||
379 | if (i960) | 378 | if (i960) { |
380 | pci_write_config_word(i960, 0x42, 0); | 379 | pci_write_config_word(i960, 0x42, 0); |
380 | pci_dev_put(i960); | ||
381 | } | ||
381 | 382 | ||
382 | c->promise = 1; | 383 | c->promise = 1; |
383 | c->limit_sectors = 1; | 384 | c->limit_sectors = 1; |