Эх сурвалжийг харах

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

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>
Ben Dooks 11 жил өмнө
parent
commit
11a808522a

+ 2 - 4
drivers/mmc/host/sh_mmcif.c

@@ -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: