Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 64216
b: refs/heads/master
c: 6e420b7
h: refs/heads/master
v: v3
  • Loading branch information
Andrey Borzenkov authored and Wim Van Sebroeck committed Aug 16, 2007
1 parent 0231f31 commit 7845492
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 568779c9c44bc20c4b7fd18a7d027517f5aaa081
refs/heads/master: 6e420b7e26dd539f1f78fe920d295b022a2d99c8
7 changes: 5 additions & 2 deletions trunk/drivers/char/watchdog/alim1535_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, },
};
Expand All @@ -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);

Expand Down

0 comments on commit 7845492

Please sign in to comment.