openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[WATCHDOG] removes pci_find_device from i6300esb.c 

This patch changes pci_find_device to pci_get_device
(encapsulated in for_each_pci_dev) in i6300esb watchdog
card with appropriate adding pci_dev_put.

Generated in 2.6.13-rc5-mm1 kernel version.

Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Jiri Slaby 2005-08-17 09:09:13 +02:00 committed by Wim Van Sebroeck
parent cc90ef0f9b
commit c69af038ca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/watchdog/i6300esb.c
View File

@ -368,12 +368,11 @@ static unsigned char __init esb_getdevice (void)
* Find the PCI device
*/
while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
for_each_pci_dev(dev)
if (pci_match_device(esb_pci_tbl, dev)) {
esb_pci = dev;
break;
}
}
if (esb_pci) {
if (pci_enable_device(esb_pci)) {
@ -430,6 +429,7 @@ static unsigned char __init esb_getdevice (void)
pci_release_region(esb_pci, 0);
err_disable:
pci_disable_device(esb_pci);
pci_dev_put(esb_pci);
}
out:
return 0;
@ -481,6 +481,7 @@ static int __init watchdog_init (void)
pci_release_region(esb_pci, 0);
/* err_disable: */
pci_disable_device(esb_pci);
pci_dev_put(esb_pci);
/* out: */
return ret;
}
@ -497,6 +498,7 @@ static void __exit watchdog_cleanup (void)
iounmap(BASEADDR);
pci_release_region(esb_pci, 0);
pci_disable_device(esb_pci);
pci_dev_put(esb_pci);
}
module_init(watchdog_init);