Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11a80852 authored by Ben Dooks's avatar Ben Dooks Committed by Ulf Hansson
Browse files

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: default avatarBen Dooks <ben.dooks@codethink.co.uk>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 6f4789e6

drivers/mmc/host/sh_mmcif.c

+2 −4
Original line number Diff line number Diff line
@@ -1444,7 +1444,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) 
					sh_mmcif_irqt, 0, name, host);

	if (ret) {

		dev_err(&pdev->dev, "request_irq error (%s)\n", name);

		goto err_irq;

		goto err_clk;

	}

	if (irq[1] >= 0) {

		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);

		if (ret) {

			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:

erqcd:

err_irq:

	pm_runtime_suspend(&pdev->dev);

err_clk:

	clk_disable_unprepare(host->hclk);

err_pm: