From 78454928135ba1e5f9ec58cd5c389f9b2e06c1ff Mon Sep 17 00:00:00 2001 From: Andrey Borzenkov Date: Thu, 16 Aug 2007 19:32:19 +0000 Subject: [PATCH] --- yaml --- r: 64216 b: refs/heads/master c: 6e420b7e26dd539f1f78fe920d295b022a2d99c8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/alim1535_wdt.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b74453ea5944..f558e6bc4c2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 568779c9c44bc20c4b7fd18a7d027517f5aaa081 +refs/heads/master: 6e420b7e26dd539f1f78fe920d295b022a2d99c8 diff --git a/trunk/drivers/char/watchdog/alim1535_wdt.c b/trunk/drivers/char/watchdog/alim1535_wdt.c index e3f6a7d0c83d..c404fc69e7e6 100644 --- a/trunk/drivers/char/watchdog/alim1535_wdt.c +++ b/trunk/drivers/char/watchdog/alim1535_wdt.c @@ -312,6 +312,7 @@ static int ali_notify_sys(struct notifier_block *this, unsigned long code, void */ static struct pci_device_id ali_pci_tbl[] = { + { PCI_VENDOR_ID_AL, 0x1533, PCI_ANY_ID, PCI_ANY_ID,}, { PCI_VENDOR_ID_AL, 0x1535, PCI_ANY_ID, PCI_ANY_ID,}, { 0, }, }; @@ -329,9 +330,11 @@ static int __init ali_find_watchdog(void) struct pci_dev *pdev; u32 wdog; - /* Check for a 1535 series bridge */ + /* Check for a 1533/1535 series bridge */ pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1535, NULL); - if(pdev == NULL) + if (pdev == NULL) + pdev = pci_get_device(PCI_VENDOR_ID_AL, 0x1533, NULL); + if (pdev == NULL) return -ENODEV; pci_dev_put(pdev);