From f90bae36a52f89e23661c0c2443261b8471e899e Mon Sep 17 00:00:00 2001
From: Wim Van Sebroeck <wim@iguana.be>
Date: Mon, 31 Aug 2009 13:49:14 +0000
Subject: [PATCH] --- yaml --- r: 163621 b: refs/heads/master c:
 d7e9791bc1cbf635f13859216a825af5199a2061 h: refs/heads/master i:   163619:
 994392add34beb205a7e0e1cf29a8990cf6dd5e8 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/watchdog/ar7_wdt.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f284411851e5..bc4101d4fd4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64d4062a3813e4816f31e2f49fd42129411975f8
+refs/heads/master: d7e9791bc1cbf635f13859216a825af5199a2061
diff --git a/trunk/drivers/watchdog/ar7_wdt.c b/trunk/drivers/watchdog/ar7_wdt.c
index 82855b063754..2e94b71b20d9 100644
--- a/trunk/drivers/watchdog/ar7_wdt.c
+++ b/trunk/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;