* [PATCH] sl82c105: Switch to ref counting API
@ 2007-04-23 13:54 Alan Cox
2007-04-23 14:04 ` Sergei Shtylyov
0 siblings, 1 reply; 2+ messages in thread
From: Alan Cox @ 2007-04-23 13:54 UTC (permalink / raw)
To: linux-ide, linux-kernel, akpm
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>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c linux-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c
--- linux.vanilla-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c 2007-04-12 14:15:04.000000000 +0100
+++ linux-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c 2007-04-23 11:58:55.016516864 +0100
@@ -349,7 +349,7 @@
/*
* 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));
if (!bridge)
return -1;
@@ -359,13 +359,15 @@
*/
if (bridge->vendor != PCI_VENDOR_ID_WINBOND ||
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;
-
+ }
/*
* We need to find function 0's revision, not function 1
*/
pci_read_config_byte(bridge, PCI_REVISION_ID, &rev);
+ pci_dev_put(bridge);
return rev;
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] sl82c105: Switch to ref counting API
2007-04-23 13:54 [PATCH] sl82c105: Switch to ref counting API Alan Cox
@ 2007-04-23 14:04 ` Sergei Shtylyov
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2007-04-23 14:04 UTC (permalink / raw)
To: Alan Cox; +Cc: linux-ide, linux-kernel, akpm
Hello.
Alan Cox wrote:
> 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>
>
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c linux-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c
> --- linux.vanilla-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c 2007-04-12 14:15:04.000000000 +0100
> +++ linux-2.6.21-rc6-mm1/drivers/ide/pci/sl82c105.c 2007-04-23 11:58:55.016516864 +0100
> @@ -349,7 +349,7 @@
> /*
> * 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));
Isn't it better to use pci_get_slot()?
WBR, Sergei
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-04-23 14:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-04-23 13:54 [PATCH] sl82c105: Switch to ref counting API Alan Cox
2007-04-23 14:04 ` Sergei Shtylyov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).