Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38291
b: refs/heads/master
c: 4802c65
h: refs/heads/master
i:
  38289: 30f09c4
  38287: 5902802
v: v3
  • Loading branch information
Wim Van Sebroeck committed Oct 3, 2006
1 parent 0b00fee commit 6f9dbef
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 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: 3836cc0ff8c875e21a8119e7a4f0227f6e227650
refs/heads/master: 4802c6533af3223f43b9e4a1bb8a2a1c51f398b1
5 changes: 4 additions & 1 deletion trunk/drivers/char/watchdog/iTCO_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
/* Module and version information */
#define DRV_NAME "iTCO_wdt"
#define DRV_VERSION "1.00"
#define DRV_RELDATE "18-Jun-2006"
#define DRV_RELDATE "19-Jul-2006"
#define PFX DRV_NAME ": "

/* Includes */
Expand Down Expand Up @@ -558,6 +558,7 @@ static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent,
if (base_address == 0x00000000) {
/* Something's wrong here, ACPIBASE has to be set */
printk(KERN_ERR PFX "failed to get TCOBASE address\n");
pci_dev_put(pdev);
return -ENODEV;
}
iTCO_wdt_private.iTCO_version = iTCO_chipset_info[ent->driver_data].iTCO_version;
Expand Down Expand Up @@ -649,6 +650,7 @@ static int iTCO_wdt_init(struct pci_dev *pdev, const struct pci_device_id *ent,
if (iTCO_wdt_private.iTCO_version == 2)
iounmap(iTCO_wdt_private.gcs);
iTCO_wdt_private.ACPIBASE = 0;
pci_dev_put(iTCO_wdt_private.pdev);
return ret;
}

Expand All @@ -664,6 +666,7 @@ static void iTCO_wdt_cleanup(void)
release_region(TCOBASE, 0x20);
if (iTCO_wdt_private.iTCO_version == 2)
iounmap(iTCO_wdt_private.gcs);
pci_dev_put(iTCO_wdt_private.pdev);
}

static int iTCO_wdt_probe(struct platform_device *dev)
Expand Down

0 comments on commit 6f9dbef

Please sign in to comment.