diff options
author | Ben Dooks <ben.dooks@codethink.co.uk> | 2014-06-04 07:42:12 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2014-07-09 05:26:02 -0400 |
commit | 11a808522af3a22a55ace9167670e18b22bce83d (patch) | |
tree | f8490f0d8643e3389b1f4bba5851a1048e7bfe0f /drivers/mmc | |
parent | 6f4789e6a81f4678b8ffa73a6226be0f99955190 (diff) |
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>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/sh_mmcif.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index a0776cec070c..80e200e59dda 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c | |||
@@ -1444,7 +1444,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) | |||
1444 | sh_mmcif_irqt, 0, name, host); | 1444 | sh_mmcif_irqt, 0, name, host); |
1445 | if (ret) { | 1445 | if (ret) { |
1446 | dev_err(&pdev->dev, "request_irq error (%s)\n", name); | 1446 | dev_err(&pdev->dev, "request_irq error (%s)\n", name); |
1447 | goto err_irq; | 1447 | goto err_clk; |
1448 | } | 1448 | } |
1449 | if (irq[1] >= 0) { | 1449 | if (irq[1] >= 0) { |
1450 | ret = devm_request_threaded_irq(&pdev->dev, irq[1], | 1450 | ret = devm_request_threaded_irq(&pdev->dev, irq[1], |
@@ -1452,7 +1452,7 @@ static int sh_mmcif_probe(struct platform_device *pdev) | |||
1452 | 0, "sh_mmc:int", host); | 1452 | 0, "sh_mmc:int", host); |
1453 | if (ret) { | 1453 | if (ret) { |
1454 | dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n"); | 1454 | dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n"); |
1455 | goto err_irq; | 1455 | goto err_clk; |
1456 | } | 1456 | } |
1457 | } | 1457 | } |
1458 | 1458 | ||
@@ -1479,8 +1479,6 @@ static int sh_mmcif_probe(struct platform_device *pdev) | |||
1479 | 1479 | ||
1480 | emmcaddh: | 1480 | emmcaddh: |
1481 | erqcd: | 1481 | erqcd: |
1482 | err_irq: | ||
1483 | pm_runtime_suspend(&pdev->dev); | ||
1484 | err_clk: | 1482 | err_clk: |
1485 | clk_disable_unprepare(host->hclk); | 1483 | clk_disable_unprepare(host->hclk); |
1486 | err_pm: | 1484 | err_pm: |