From 8f78c3ad9daab0d8461af8a2ebfc768ca463eb76 Mon Sep 17 00:00:00 2001 From: Prarit Bhargava Date: Wed, 27 Oct 2010 09:50:22 -0400 Subject: [PATCH] --- yaml --- r: 220568 b: refs/heads/master c: ad1d3a26cdb9a0eaa0bf8351a000df0f256b0baa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/iTCO_wdt.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 00ad22957c6d..2c46737a2d29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b63aa731cd9e3fed7694a99f9c233f5f4b244f03 +refs/heads/master: ad1d3a26cdb9a0eaa0bf8351a000df0f256b0baa diff --git a/trunk/drivers/watchdog/iTCO_wdt.c b/trunk/drivers/watchdog/iTCO_wdt.c index bc69731a5e6a..f7e90fe47b71 100644 --- a/trunk/drivers/watchdog/iTCO_wdt.c +++ b/trunk/drivers/watchdog/iTCO_wdt.c @@ -786,7 +786,6 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, /* Something's wrong here, ACPIBASE has to be set */ printk(KERN_ERR PFX "failed to get TCOBASE address, " "device disabled by hardware/BIOS\n"); - pci_dev_put(pdev); return -ENODEV; } iTCO_wdt_private.iTCO_version = @@ -886,7 +885,6 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev, if (iTCO_wdt_private.iTCO_version == 2) iounmap(iTCO_wdt_private.gcs); out: - pci_dev_put(iTCO_wdt_private.pdev); iTCO_wdt_private.ACPIBASE = 0; return ret; }