summaryrefslogtreecommitdiff
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorBanajit Goswami <banajit.g@samsung.com>2010-05-20 14:58:25 +0400
committerWim Van Sebroeck <wim@iguana.be>2010-05-25 13:06:21 +0400
commit100fb76f0acfebcb7c72875890b9ef33ff04dc2b (patch)
tree95d997be39f1f3c3ee979f9e255b50ae0cd7b99d /drivers/watchdog
parent8740f71d7f4f0400cd8c42e6584155024119d77e (diff)
downloadlinux-100fb76f0acfebcb7c72875890b9ef33ff04dc2b.tar.xz
watchdog: s3c2410_wdt - Fix on handling of the request_mem_region fail
If the request for wdt_mem region fails, this patch modifies the driver such that, it does not try to release the wdt_mem region on exit. Signed-off-by: Banajit Goswami <banajit.g@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/s3c2410_wdt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
index 095cbf38eb5d..300932580ded 100644
--- a/drivers/watchdog/s3c2410_wdt.c
+++ b/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);