aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-09-30 23:27:59 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-01 00:39:23 -0700
commitdf10f4edd5f097251c62f1d4a3adea778100b4a8 (patch)
treeb5f7ba2e0ed805de67f9a9774d982a08e4f291df /drivers
parent1aff0ecafb5e94515dc37849fd32a810554f34f4 (diff)
downloadkernel_samsung_smdk4412-df10f4edd5f097251c62f1d4a3adea778100b4a8.zip
kernel_samsung_smdk4412-df10f4edd5f097251c62f1d4a3adea778100b4a8.tar.gz
kernel_samsung_smdk4412-df10f4edd5f097251c62f1d4a3adea778100b4a8.tar.bz2
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/message/i2o/pci.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 1b58444..dec41cc 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;