Prev: jz4740-adc: fix resource reclaim in jz4740_adc_probe error path
Next: Bug#587665: Safety of early boot init of /dev/random seed
From: Samuel Ortiz on 1 Aug 2010 18:50
Hi Axel,

On Thu, Jul 29, 2010 at 04:25:53PM +0800, Axel Lin wrote:
> If kmalloc() fails, exit with -ENOMEM.
Could you please separate this patch in 2, as the 2 drivers live in different
trees for now ?

Cheers,
Samuel.


> Signed-off-by: Axel Lin <axel.lin(a)gmail.com>
> ---
> This patch is against linux-next.
> drivers/hwmon/jz4740-hwmon.c | 4 ++++
> drivers/mfd/jz4740-adc.c | 4 ++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/hwmon/jz4740-hwmon.c b/drivers/hwmon/jz4740-hwmon.c
> index 72a4335..1c8b3d9 100644
> --- a/drivers/hwmon/jz4740-hwmon.c
> +++ b/drivers/hwmon/jz4740-hwmon.c
> @@ -107,6 +107,10 @@ static int __devinit jz4740_hwmon_probe(struct platform_device *pdev)
> struct jz4740_hwmon *hwmon;
>
> hwmon = kmalloc(sizeof(*hwmon), GFP_KERNEL);
> + if (!hwmon) {
> + dev_err(&pdev->dev, "Failed to allocate driver structure\n");
> + return -ENOMEM;
> + }
>
> hwmon->cell = pdev->dev.platform_data;
>
> 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/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: jz4740-adc: fix resource reclaim in jz4740_adc_probe error path
Next: Bug#587665: Safety of early boot init of /dev/random seed