projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet...
[linux-2.6-microblaze.git]
/
drivers
/
dma
/
stm32-dma.c
diff --git
a/drivers/dma/stm32-dma.c
b/drivers/dma/stm32-dma.c
index
f54ecb1
..
7dd1d3d
100644
(file)
--- a/
drivers/dma/stm32-dma.c
+++ b/
drivers/dma/stm32-dma.c
@@
-1200,7
+1200,7
@@
static int stm32_dma_alloc_chan_resources(struct dma_chan *c)
chan->config_init = false;
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;
if (ret < 0)
return ret;
@@
-1470,7
+1470,7
@@
static int stm32_dma_suspend(struct device *dev)
struct stm32_dma_device *dmadev = dev_get_drvdata(dev);
int id, ret, scr;
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;
if (ret < 0)
return ret;