Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[~andy/linux] / drivers / mfd / jz4740-adc.c

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 7a844aef5dcf70689fc54dc97a3740630a5d6d41..3ad492cb6c4158b9160e3a2fefc7fb6423086ba5 100644 (file)
--- 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) {
@@ -322,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);