diff options
| author | Vinod Koul <vkoul@kernel.org> | 2021-08-02 12:34:48 +0530 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2021-08-02 12:34:48 +0530 |
| commit | ffa179ae2af6b32b1f72f4490989cd69f6385688 (patch) | |
| tree | 54afdcc9469353c629b0729ffb1ea056f595a6aa /drivers/dma/stm32-dmamux.c | |
| parent | dd861267bfecc49df5232c33d3566a334ff5e9f6 (diff) | |
| parent | 7199ddede9f0f2f68d41e6928e1c6c4bca9c39c0 (diff) | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/dma/stm32-dmamux.c')
| -rw-r--r-- | drivers/dma/stm32-dmamux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/stm32-dmamux.c b/drivers/dma/stm32-dmamux.c index ef0d0555103d..a42164389ebc 100644 --- a/drivers/dma/stm32-dmamux.c +++ b/drivers/dma/stm32-dmamux.c @@ -137,7 +137,7 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec, /* Set dma request */ spin_lock_irqsave(&dmamux->lock, flags); - ret = pm_runtime_get_sync(&pdev->dev); + ret = pm_runtime_resume_and_get(&pdev->dev); if (ret < 0) { spin_unlock_irqrestore(&dmamux->lock, flags); goto error; @@ -336,7 +336,7 @@ static int stm32_dmamux_suspend(struct device *dev) struct stm32_dmamux_data *stm32_dmamux = platform_get_drvdata(pdev); int i, ret; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; @@ -361,7 +361,7 @@ static int stm32_dmamux_resume(struct device *dev) if (ret < 0) return ret; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; |