Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 15:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

sl82c105: Switch to ref counting API

Browse Source 
Not sure how this one got missed in the great purge some time ago but it did.

Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Alan Cox 2007-05-16 00:51:46 +02:00 committed by Bartlomiej Zolnierkiewicz
parent 122ab0887c
commit 640b31bf12
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/ide/pci/sl82c105.c
View File

@ -349,7 +349,7 @@ static unsigned int sl82c105_bridge_revision(struct pci_dev *dev)
/* /*
* The bridge should be part of the same device, but function 0. * The bridge should be part of the same device, but function 0.
*/ */
bridge = pci_find_slot(dev->bus->number, bridge = pci_get_bus_and_slot(dev->bus->number,
PCI_DEVFN(PCI_SLOT(dev->devfn), 0)); PCI_DEVFN(PCI_SLOT(dev->devfn), 0));
if (!bridge) if (!bridge)
return -1; return -1;
@ -359,13 +359,15 @@ static unsigned int sl82c105_bridge_revision(struct pci_dev *dev)
*/ */
if (bridge->vendor != PCI_VENDOR_ID_WINBOND || if (bridge->vendor != PCI_VENDOR_ID_WINBOND ||
bridge->device != PCI_DEVICE_ID_WINBOND_83C553 || bridge->device != PCI_DEVICE_ID_WINBOND_83C553 ||
bridge->class >> 8 != PCI_CLASS_BRIDGE_ISA) bridge->class >> 8 != PCI_CLASS_BRIDGE_ISA) {
pci_dev_put(bridge);
return -1; return -1;
}
/* /*
* We need to find function 0's revision, not function 1 * We need to find function 0's revision, not function 1
*/ */
pci_read_config_byte(bridge, PCI_REVISION_ID, &rev); pci_read_config_byte(bridge, PCI_REVISION_ID, &rev);
pci_dev_put(bridge);
return rev; return rev;
} }