summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJiri Slaby <xslaby@fi.muni.cz>2005-08-22 09:05:03 +0200
committerWim Van Sebroeck <wim@iguana.be>2005-09-11 21:56:10 +0200
commitbb5dc36644975ca5237a415fb63f59f9803d84fa (patch)
treeb1c15ddc813c7869bbbaaf1d3cb3701b95b5331e /drivers/char
parent811f999160487c586917937e95506cb8528472a3 (diff)
downloadop-kernel-dev-bb5dc36644975ca5237a415fb63f59f9803d84fa.zip
op-kernel-dev-bb5dc36644975ca5237a415fb63f59f9803d84fa.tar.gz
[WATCHDOG] i6300esb.c-2-bugs-little-cleanup.patch
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/watchdog/i6300esb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/i6300esb.c b/drivers/char/watchdog/i6300esb.c
index 823924e..575d6cd 100644
--- a/drivers/char/watchdog/i6300esb.c
+++ b/drivers/char/watchdog/i6300esb.c
@@ -345,7 +345,7 @@ static struct notifier_block esb_notifier = {
* want to register another driver on the same PCI id.
*/
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 */
};
MODULE_DEVICE_TABLE (pci, esb_pci_tbl);
@@ -365,7 +365,7 @@ static unsigned char __init esb_getdevice (void)
*/
for_each_pci_dev(dev) {
- if (pci_match_device(esb_pci_tbl, dev)) {
+ if (pci_match_id(esb_pci_tbl, dev)) {
esb_pci = dev;
break;
}
OpenPOWER on IntegriCloud