lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Axel Lin
2010-07-29 16:28:25 +08:00
committed by Samuel Ortiz
parent 889135210b
commit 48736c80e5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/mfd/jz4740-adc.c
View File

@@ -322,9 +322,15 @@ static int __devinit jz4740_adc_probe(struct platform_device *pdev)
writeb(0x00, adc->base + JZ_REG_ADC_ENABLE); writeb(0x00, adc->base + JZ_REG_ADC_ENABLE);
writeb(0xff, adc->base + JZ_REG_ADC_CTRL); 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); 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: err_iounmap:
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
iounmap(adc->base); iounmap(adc->base);