Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 100fb76f authored by Banajit Goswami's avatar Banajit Goswami Committed by Wim Van Sebroeck
Browse files

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: default avatarBanajit Goswami <banajit.g@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 8740f71d

drivers/watchdog/s3c2410_wdt.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -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;

		return -EBUSY;

		goto err_req;

	}

	}





	wdt_base = ioremap(res->start, size);

	wdt_base = ioremap(res->start, size);