2010-08-02 01:11:08

by Axel Lin

Subject: [PATCH RESEND] jz4740-adc: check kmalloc() result

>From 40f965e63c4aefb402d85cf8392681565e172d2d Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Mon, 2 Aug 2010 09:02:02 +0800
Subject: [PATCH] jz4740-adc: check kmalloc() result

If kmalloc() fails exit with -ENOMEM.

Signed-off-by: Axel Lin <[email protected]>
---
This patch is against linux-next.
This resend separates the fix for jz4740-hwmon and jz474-adc in 2 patches.
drivers/mfd/jz4740-adc.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 7a844ae..2846d24 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -260,6 +260,10 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
int irq;

adc = kmalloc(sizeof(*adc), GFP_KERNEL);
+ if (!adc) {
+ dev_err(&pdev->dev, "Failed to allocate driver structure\n");
+ return -ENOMEM;
+ }

adc->irq = platform_get_irq(pdev, 0);
if (adc->irq < 0) {
--
1.5.4.3

2010-08-02 08:49:39

by Samuel Ortiz

Subject: Re: [PATCH RESEND] jz4740-adc: check kmalloc() result

Hi Axel,

On Mon, Aug 02, 2010 at 09:12:04AM +0800, Axel Lin wrote:
> >From 40f965e63c4aefb402d85cf8392681565e172d2d Mon Sep 17 00:00:00 2001
> From: Axel Lin <[email protected]>
> Date: Mon, 2 Aug 2010 09:02:02 +0800
> Subject: [PATCH] jz4740-adc: check kmalloc() result
>
> If kmalloc() fails exit with -ENOMEM.
Thanks a lot, patch applied against my for-next branch.

Cheers,
Samuel.


> Signed-off-by: Axel Lin <[email protected]>
> ---
> This patch is against linux-next.
> This resend separates the fix for jz4740-hwmon and jz474-adc in 2 patches.
> drivers/mfd/jz4740-adc.c | 4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
> index 7a844ae..2846d24 100644
> --- a/drivers/mfd/jz4740-adc.c
> +++ b/drivers/mfd/jz4740-adc.c
> @@ -260,6 +260,10 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
> int irq;
>
> adc = kmalloc(sizeof(*adc), GFP_KERNEL);
> + if (!adc) {
> + dev_err(&pdev->dev, "Failed to allocate driver structure\n");
> + return -ENOMEM;
> + }
>
> adc->irq = platform_get_irq(pdev, 0);
> if (adc->irq < 0) {
> --
> 1.5.4.3
>
>
>

--
Intel Open Source Technology Centre
http://oss.intel.com/