summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2016-11-16 10:24:15 -0800
committerVinod Koul <vinod.koul@intel.com>2016-11-17 16:09:23 +0530
commitd5afc1b68a6ddc27746d31f775025afe75ec8122 (patch)
treef20ea6d2137c340c5233564f4de61380591676ed
parent740b4be3f742100ea66f0f9ee9715b10ee304a90 (diff)
downloadop-kernel-dev-d5afc1b68a6ddc27746d31f775025afe75ec8122.zip
op-kernel-dev-d5afc1b68a6ddc27746d31f775025afe75ec8122.tar.gz
dmaengine: cppi41: More PM runtime fixes
Fix use of u32 instead of int for checking for negative errors values as pointed out by Dan Carpenter <dan.carpenter@oracle.com>. And while testing the PM runtime error path by randomly returning failed values in runtime resume, I noticed two more places that need fixing: - If pm_runtime_get_sync() fails in probe, we still need to do pm_runtime_put_sync() to keep the use count happy. We could call pm_runtime_put_noidle() on the error path, but we're just going to call pm_runtime_disable() after that so pm_runtime_put_sync() will do what we want - We should print an error if pm_runtime_get_sync() fails in cppi41_dma_alloc_chan_resources() so we know where it happens Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Fixes: 740b4be3f742 ("dmaengine: cpp41: Fix handling of error path") Signed-off-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r--drivers/dma/cppi41.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c
index 4b52126..d5ba43a 100644
--- a/drivers/dma/cppi41.c
+++ b/drivers/dma/cppi41.c
@@ -317,11 +317,12 @@ static irqreturn_t cppi41_irq(int irq, void *data)
while (val) {
u32 desc, len;
+ int error;
- status = pm_runtime_get(cdd->ddev.dev);
- if (status < 0)
+ error = pm_runtime_get(cdd->ddev.dev);
+ if (error < 0)
dev_err(cdd->ddev.dev, "%s pm runtime get: %i\n",
- __func__, status);
+ __func__, error);
q_num = __fls(val);
val &= ~(1 << q_num);
@@ -367,6 +368,8 @@ static int cppi41_dma_alloc_chan_resources(struct dma_chan *chan)
error = pm_runtime_get_sync(cdd->ddev.dev);
if (error < 0) {
+ dev_err(cdd->ddev.dev, "%s pm runtime get: %i\n",
+ __func__, error);
pm_runtime_put_noidle(cdd->ddev.dev);
return error;
@@ -1072,8 +1075,8 @@ err_chans:
deinit_cppi41(dev, cdd);
err_init_cppi:
pm_runtime_dont_use_autosuspend(dev);
- pm_runtime_put_sync(dev);
err_get_sync:
+ pm_runtime_put_sync(dev);
pm_runtime_disable(dev);
iounmap(cdd->usbss_mem);
iounmap(cdd->ctrl_mem);
OpenPOWER on IntegriCloud