summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2009-08-31 13:49:14 +0000
committerWim Van Sebroeck <wim@iguana.be>2009-09-18 08:38:04 +0000
commitd7e9791bc1cbf635f13859216a825af5199a2061 (patch)
treea29d51d59d33b7e89054a3529344f2489cecf913 /drivers/watchdog
parent64d4062a3813e4816f31e2f49fd42129411975f8 (diff)
downloadlinux-d7e9791bc1cbf635f13859216a825af5199a2061.tar.bz2
[WATCHDOG] ar7_wdt: Fix error handling during probe.
Fix error handling in the probe function. Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Tested-by: Florian Fainelli <florian@openwrt.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/ar7_wdt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c
index 82855b063754..2e94b71b20d9 100644
--- a/drivers/watchdog/ar7_wdt.c
+++ b/drivers/watchdog/ar7_wdt.c
@@ -295,7 +295,7 @@ static int __devinit ar7_wdt_probe(struct platform_device *pdev)
if (!ar7_wdt) {
printk(KERN_ERR DRVNAME ": could not ioremap registers\n");
rc = -ENXIO;
- goto out;
+ goto out_mem_region;
}
ar7_wdt_disable_wdt();
@@ -311,6 +311,7 @@ static int __devinit ar7_wdt_probe(struct platform_device *pdev)
out_alloc:
iounmap(ar7_wdt);
+out_mem_region:
release_mem_region(ar7_regs_wdt->start, resource_size(ar7_regs_wdt));
out:
return rc;