From 6f9dbef5db39f19b8e08e9c37d12bd6fd17461a0 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Wed, 19 Jul 2006 22:39:13 +0200 Subject: [PATCH] --- yaml --- r: 38291 b: refs/heads/master c: 4802c6533af3223f43b9e4a1bb8a2a1c51f398b1 h: refs/heads/master i: 38289: 30f09c4d19d60a535e410434c39d7f796bffb4ae 38287: 59028027bdf6db8e1bb74c77ced6758415106de6 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/iTCO_wdt.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a330a621694..2116424deab0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3836cc0ff8c875e21a8119e7a4f0227f6e227650 +refs/heads/master: 4802c6533af3223f43b9e4a1bb8a2a1c51f398b1 diff --git a/trunk/drivers/char/watchdog/iTCO_wdt.c b/trunk/drivers/char/watchdog/iTCO_wdt.c index cbdfbf00cfb7..852ad8389bc7 100644 --- a/trunk/drivers/char/watchdog/iTCO_wdt.c +++ b/trunk/drivers/char/watchdog/iTCO_wdt.c @@ -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 */ @@ -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; @@ -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; } @@ -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)