[PATCH 2/5] [WATCHDOG] s3c2410_wdt - Avoid freeing memory, if memory region could not be allocated

Sergei Shtylyov sshtylyov at mvista.com
Thu May 20 06:00:05 EDT 2010


Hello.

Kukjin Kim wrote:

> From: Banajit Goswami <banajit.g at samsung.com>

> In case the WDT device memory allocation fails, this patch modifies the

    This is not memory allocation.

> driver such that, it does not try to free the memory on exit.

> Signed-off-by: Banajit Goswami <banajit.g at samsung.com>
> Signed-off-by: Kukjin Kim <kgene.kim at samsung.com>
> ---
>  drivers/watchdog/s3c2410_wdt.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c
> index e4cebef..d421258 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 -ENOMEM;

    It should be EBUSY actually...


WBR, Sergei



More information about the linux-arm-kernel mailing list