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

[WATCHDOG] i6300esb.c-2-bugs-little-cleanup.patch

Browse Source 
In i6300esb.c watchdog card driver were 2 bugs (misused pc_match_device and
pci_dev_put wasn't called in one error case) and one little cleanup was
done (long line was converted to a shorter one with using built-in macro).

Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@osdl.org>
This commit is contained in:
Jiri Slaby 2005-08-22 09:05:03 +02:00 committed by Wim Van Sebroeck
parent 811f999160
commit bb5dc36644
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,7 +345,7 @@ static struct notifier_block esb_notifier = {
* want to register another driver on the same PCI id. * want to register another driver on the same PCI id.
*/ */
static struct pci_device_id esb_pci_tbl[] = { static struct pci_device_id esb_pci_tbl[] = {
{ PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9, PCI_ANY_ID, PCI_ANY_ID, }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), },
{ 0, }, /* End of list */ { 0, }, /* End of list */
}; };
MODULE_DEVICE_TABLE (pci, esb_pci_tbl); MODULE_DEVICE_TABLE (pci, esb_pci_tbl);
@ -365,7 +365,7 @@ static unsigned char __init esb_getdevice (void)
*/ */
for_each_pci_dev(dev) { for_each_pci_dev(dev) {
if (pci_match_device(esb_pci_tbl, dev)) { if (pci_match_id(esb_pci_tbl, dev)) {
esb_pci = dev; esb_pci = dev;
break; break;
} }