Merge tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma

Pull dmaengine fix from Vinod Koul:

 - qcom bam runtime_pm fix

 - email update for Vinod

* tag 'dmaengine-fix-4.17-rc6' of git://git.infradead.org/users/vkoul/slave-dma:
  dmaengine: qcom: bam_dma: check if the runtime pm enabled
  dmaengine: Update email address for Vinod

2 files changed, 14 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index d155d1e0dbc2..078fd80f664f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4309,7 +4309,7 @@ F:	Documentation/driver-api/dma-buf.rst
 T:      git git://anongit.freedesktop.org/drm/drm-misc
 
 DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
-M:      Vinod Koul <vinod.koul@intel.com>
+M:      Vinod Koul <vkoul@kernel.org>
 L:      dmaengine@vger.kernel.org
 Q:      https://patchwork.kernel.org/project/linux-dmaengine/list/
 S:      Maintained
diff --git a/drivers/dma/qcom/bam_dma.c b/drivers/dma/qcom/bam_dma.c
index d29275b97e84..4a828c18099a 100644
--- a/drivers/dma/qcom/bam_dma.c
+++ b/drivers/dma/qcom/bam_dma.c
@@ -524,6 +524,14 @@ static int bam_alloc_chan(struct dma_chan *chan)
         return 0;
 }
 
+static int bam_pm_runtime_get_sync(struct device *dev)
+{
+        if (pm_runtime_enabled(dev))
+                return pm_runtime_get_sync(dev);
+
+        return 0;
+}
+
 /**
  * bam_free_chan - Frees dma resources associated with specific channel
  * @chan: specified channel
@@ -539,7 +547,7 @@ static void bam_free_chan(struct dma_chan *chan)
         unsigned long flags;
         int ret;
 
-        ret = pm_runtime_get_sync(bdev->dev);
+        ret = bam_pm_runtime_get_sync(bdev->dev);
         if (ret < 0)
                 return;
 
@@ -720,7 +728,7 @@ static int bam_pause(struct dma_chan *chan)
         unsigned long flag;
         int ret;
 
-        ret = pm_runtime_get_sync(bdev->dev);
+        ret = bam_pm_runtime_get_sync(bdev->dev);
         if (ret < 0)
                 return ret;
 
@@ -746,7 +754,7 @@ static int bam_resume(struct dma_chan *chan)
         unsigned long flag;
         int ret;
 
-        ret = pm_runtime_get_sync(bdev->dev);
+        ret = bam_pm_runtime_get_sync(bdev->dev);
         if (ret < 0)
                 return ret;
 
@@ -852,7 +860,7 @@ static irqreturn_t bam_dma_irq(int irq, void *data)
         if (srcs & P_IRQ)
                 tasklet_schedule(&bdev->task);
 
-        ret = pm_runtime_get_sync(bdev->dev);
+        ret = bam_pm_runtime_get_sync(bdev->dev);
         if (ret < 0)
                 return ret;
 
@@ -969,7 +977,7 @@ static void bam_start_dma(struct bam_chan *bchan)
         if (!vd)
                 return;
 
-        ret = pm_runtime_get_sync(bdev->dev);
+        ret = bam_pm_runtime_get_sync(bdev->dev);
         if (ret < 0)
                 return;