aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/sh/usb-dmac.c
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-10-25 11:09:34 +0100
committerVinod Koul <vinod.koul@intel.com>2015-11-16 08:39:52 +0530
commitbf55555baaf80cdf2cc4176fee02545a07a8ff4a (patch)
treee5dc2030d4a91a64dc64092909c468c8fde28079 /drivers/dma/sh/usb-dmac.c
parent36fa4a530b7798aa85789953b08d94c03fb09fa5 (diff)
dmaengine: sh: usb-dmac: Fix pm_runtime_{enable,disable}() imbalance
If the call to pm_runtime_get_sync() failed, Runtime PM was left enabled. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/sh/usb-dmac.c')
-rw-r--r--drivers/dma/sh/usb-dmac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/sh/usb-dmac.c b/drivers/dma/sh/usb-dmac.c
index f305738b5adf..f1bcc2a163b3 100644
--- a/drivers/dma/sh/usb-dmac.c
+++ b/drivers/dma/sh/usb-dmac.c
@@ -802,7 +802,7 @@ static int usb_dmac_probe(struct platform_device *pdev)
ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0) {
dev_err(&pdev->dev, "runtime PM get sync failed (%d)\n", ret);
- return ret;
+ goto error_pm;
}
ret = usb_dmac_init(dmac);
@@ -859,6 +859,7 @@ static int usb_dmac_probe(struct platform_device *pdev)
error:
of_dma_controller_free(pdev->dev.of_node);
pm_runtime_put(&pdev->dev);
+error_pm:
pm_runtime_disable(&pdev->dev);
return ret;
}

Privacy Policy