From 7627974d6e3a1a1a0919dd29e918c15c2cf23d83 Mon Sep 17 00:00:00 2001
From: Banajit Goswami <banajit.g@samsung.com>
Date: Thu, 20 May 2010 11:58:25 +0100
Subject: [PATCH] --- yaml --- r: 198376 b: refs/heads/master c:
 100fb76f0acfebcb7c72875890b9ef33ff04dc2b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 55c25ba617ee..7a38671105c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8740f71d7f4f0400cd8c42e6584155024119d77e
+refs/heads/master: 100fb76f0acfebcb7c72875890b9ef33ff04dc2b
diff --git a/trunk/drivers/watchdog/s3c2410_wdt.c b/trunk/drivers/watchdog/s3c2410_wdt.c
index 095cbf38eb5d..300932580ded 100644
--- a/trunk/drivers/watchdog/s3c2410_wdt.c
+++ b/trunk/drivers/watchdog/s3c2410_wdt.c
@@ -426,8 +426,7 @@ static int __devinit s3c2410wdt_probe(struct platform_device *pdev)
 	wdt_mem = request_mem_region(res->start, size, pdev->name);
 	if (wdt_mem == NULL) {
 		dev_err(dev, "failed to get memory region\n");
-		ret = -ENOENT;
-		goto err_req;
+		return -EBUSY;
 	}
 
 	wdt_base = ioremap(res->start, size);