From 21fcd8faff674e2da87401fad55d0c1e656d7fc8 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Sat, 30 Sep 2006 23:27:59 -0700 Subject: [PATCH] --- yaml --- r: 37651 b: refs/heads/master c: df10f4edd5f097251c62f1d4a3adea778100b4a8 h: refs/heads/master i: 37649: 4b1f8f89d53d419f0e93ac88e956bdd0b19a5090 37647: 7967f29f7bd8c8c6b6c121e342a04f397c882abc v: v3 --- [refs] | 2 +- trunk/drivers/message/i2o/pci.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a31f565989d2..021c01608a53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1aff0ecafb5e94515dc37849fd32a810554f34f4 +refs/heads/master: df10f4edd5f097251c62f1d4a3adea778100b4a8 diff --git a/trunk/drivers/message/i2o/pci.c b/trunk/drivers/message/i2o/pci.c index 1b58444d5aaf..dec41cc89937 100644 --- a/trunk/drivers/message/i2o/pci.c +++ b/trunk/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;