Browse Source

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>
Banajit Goswami 15 years ago
parent
commit
100fb76f0a
1 changed files with 1 additions and 2 deletions
  1. 1 2
      drivers/watchdog/s3c2410_wdt.c

+ 1 - 2
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);
 	wdt_mem = request_mem_region(res->start, size, pdev->name);
 	if (wdt_mem == NULL) {
 	if (wdt_mem == NULL) {
 		dev_err(dev, "failed to get memory region\n");
 		dev_err(dev, "failed to get memory region\n");
-		ret = -ENOENT;
-		goto err_req;
+		return -EBUSY;
 	}
 	}
 
 
 	wdt_base = ioremap(res->start, size);
 	wdt_base = ioremap(res->start, size);