Prev: ARM: cam60: move cam60_spi_devices to .init.data
Next: jz4740-adc/jz4740-hwmon: check kmalloc() result
From: Samuel Ortiz on 1 Aug 2010 18:50
Hi Axel,

On Thu, Jul 29, 2010 at 04:28:25PM +0800, Axel Lin wrote:
> If mfd_add_devices() fail, we need to relese allocated resources.
Patch applied, thanks a lot.

Cheers,
Samuel.


> Signed-off-by: Axel Lin <axel.lin(a)gmail.com>
> ---
> This patch is against linux-next.
> drivers/mfd/jz4740-adc.c | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
> index 2846d24..3ad492c 100644
> --- a/drivers/mfd/jz4740-adc.c
> +++ b/drivers/mfd/jz4740-adc.c
> @@ -326,9 +326,15 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
> writeb(0x00, adc->base + JZ_REG_ADC_ENABLE);
> writeb(0xff, adc->base + JZ_REG_ADC_CTRL);
>
> - return mfd_add_devices(&pdev->dev, 0, jz4740_adc_cells,
> + ret = mfd_add_devices(&pdev->dev, 0, jz4740_adc_cells,
> ARRAY_SIZE(jz4740_adc_cells), mem_base, adc->irq_base);
> + if (ret < 0)
> + goto err_clk_put;
>
> + return 0;
> +
> +err_clk_put:
> + clk_put(adc->clk);
> err_iounmap:
> platform_set_drvdata(pdev, NULL);
> iounmap(adc->base);
> --
> 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: ARM: cam60: move cam60_spi_devices to .init.data
Next: jz4740-adc/jz4740-hwmon: check kmalloc() result