summaryrefslogtreecommitdiffstats
path: root/drivers/dma/dmaengine.c
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@linux.intel.com>2016-04-07 15:49:43 +0200
committerVinod Koul <vinod.koul@intel.com>2016-04-13 17:39:21 +0200
commit4c4d7f878589585d32b81aab6ed4a5066fae1091 (patch)
tree0c93f39ba5ccaf53243aa2697383b285bf7f33a3 /drivers/dma/dmaengine.c
parentdmaengine: core: Use dev_ functions for debug and error prints (diff)
downloadlinux-4c4d7f878589585d32b81aab6ed4a5066fae1091.tar.xz
linux-4c4d7f878589585d32b81aab6ed4a5066fae1091.zip
dmaengine: core: Revert back to pr_debug in __dma_request_channel()
Commit ef859312c3a1 ("dmaengine: core: Use dev_ functions for debug and error prints") wasn't quite right in __dma_request_channel() by claiming that all pr_ prints have valid DMA channel pointer. Obviously it is not true as __dma_request_channel() is looking for a channel and returns NULL if it does not find it. Prevent this potential NULL pointer dereference by reverting back to pr_debug(). Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/dmaengine.c')
-rw-r--r--drivers/dma/dmaengine.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c
index a7131d4141d8..ca1400d66957 100644
--- a/drivers/dma/dmaengine.c
+++ b/drivers/dma/dmaengine.c
@@ -664,7 +664,7 @@ struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask,
}
mutex_unlock(&dma_list_mutex);
- dev_dbg(chan->device->dev, "%s: %s (%s)\n",
+ pr_debug("%s: %s (%s)\n",
__func__,
chan ? "success" : "fail",
chan ? dma_chan_name(chan) : NULL);