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-dma.c | |
| parent | dd861267bfecc49df5232c33d3566a334ff5e9f6 (diff) | |
| parent | 7199ddede9f0f2f68d41e6928e1c6c4bca9c39c0 (diff) | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/dma/stm32-dma.c')
| -rw-r--r-- | drivers/dma/stm32-dma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/stm32-dma.c b/drivers/dma/stm32-dma.c index d3aa34b3d2f7..9063c727962e 100644 --- a/drivers/dma/stm32-dma.c +++ b/drivers/dma/stm32-dma.c @@ -1202,7 +1202,7 @@ static int stm32_dma_alloc_chan_resources(struct dma_chan *c) chan->config_init = false; - ret = pm_runtime_get_sync(dmadev->ddev.dev); + ret = pm_runtime_resume_and_get(dmadev->ddev.dev); if (ret < 0) return ret; @@ -1474,7 +1474,7 @@ static int stm32_dma_suspend(struct device *dev) struct stm32_dma_device *dmadev = dev_get_drvdata(dev); int id, ret, scr; - ret = pm_runtime_get_sync(dev); + ret = pm_runtime_resume_and_get(dev); if (ret < 0) return ret; |