kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mmc: sh-mmcif: no need to call pm_runtime_suspend on error

Browse source 
The pm_runtime call should implicitly disable the device once the
probe is over if there is no explicit reference gained. There is no
need to call pm_runtime_suspend() before the pm_runtime_disable()
call.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ben Dooks 2014-06-04 12:42:12 +01:00 committed by Ulf Hansson
parent 6f4789e6a8
commit 11a808522a
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mmc/host/sh_mmcif.c
View file

@ -1444,7 +1444,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
sh_mmcif_irqt, 0, name, host); sh_mmcif_irqt, 0, name, host);
if (ret) { if (ret) {
dev_err(&pdev->dev, "request_irq error (%s)\n", name); dev_err(&pdev->dev, "request_irq error (%s)\n", name);
goto err_irq; goto err_clk;
} }
if (irq[1] >= 0) { if (irq[1] >= 0) {
ret = devm_request_threaded_irq(&pdev->dev, irq[1], ret = devm_request_threaded_irq(&pdev->dev, irq[1],
@ -1452,7 +1452,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
0, "sh_mmc:int", host); 0, "sh_mmc:int", host);
if (ret) { if (ret) {
dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n"); dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
goto err_irq; goto err_clk;
} }
} }
@ -1479,8 +1479,6 @@ static int sh_mmcif_probe(struct platform_device *pdev)
emmcaddh: emmcaddh:
erqcd: erqcd:
err_irq:
pm_runtime_suspend(&pdev->dev);
err_clk: err_clk:
clk_disable_unprepare(host->hclk); clk_disable_unprepare(host->hclk);
err_pm: err_pm: