summaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-07-29 16:28:25 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2010-08-12 11:28:01 +0200
commit48736c80e5d0c7c9db97bd6643a979a4ab11f25b (patch)
tree48652b4fd0284dfc7ed871e45c423b0b06ab4a09 /drivers/mfd
parent889135210b794df9cea4b1e94dff78c264edc5e7 (diff)
downloadop-kernel-dev-48736c80e5d0c7c9db97bd6643a979a4ab11f25b.zip
op-kernel-dev-48736c80e5d0c7c9db97bd6643a979a4ab11f25b.tar.gz
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>
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/jz4740-adc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mfd/jz4740-adc.c b/drivers/mfd/jz4740-adc.c
index 7a844ae..b30e44a 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);
OpenPOWER on IntegriCloud