From: Axel Lin <axel.lin@gmail.com>
Date: Thu, 29 Jul 2010 08:28:25 +0000 (+0800)
Subject: mfd: Fix jz4740-adc resource reclaim in probe error path
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=48736c80e5d0c7c9db97bd6643a979a4ab11f25b;p=linux-beck.git

mfd: Fix jz4740-adc resource reclaim in probe error path

If mfd_add_devices() fail, we need to relese allocated resources.

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 7a844aef5dcf..b30e44ac4d1c 100644
--- a/drivers/mfd/jz4740-adc.c
+++ b/drivers/mfd/jz4740-adc.c
@@ -322,9 +322,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);