Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+14
-6
+1
-1
MAINTAINERS
+1
-1
MAINTAINERS
···
4309
4309
T: git git://anongit.freedesktop.org/drm/drm-misc
4310
4310
4311
4311
DMA GENERIC OFFLOAD ENGINE SUBSYSTEM
4312
-
M: Vinod Koul <vinod.koul@intel.com>
4312
+
M: Vinod Koul <vkoul@kernel.org>
4313
4313
L: dmaengine@vger.kernel.org
4314
4314
Q: https://patchwork.kernel.org/project/linux-dmaengine/list/
4315
4315
S: Maintained
+13
-5
drivers/dma/qcom/bam_dma.c
+13
-5
drivers/dma/qcom/bam_dma.c
···
524
524
return 0;
525
525
}
526
526
527
+
static int bam_pm_runtime_get_sync(struct device *dev)
528
+
{
529
+
if (pm_runtime_enabled(dev))
530
+
return pm_runtime_get_sync(dev);
531
+
532
+
return 0;
533
+
}
534
+
527
535
/**
528
536
* bam_free_chan - Frees dma resources associated with specific channel
529
537
* @chan: specified channel
···
547
539
unsigned long flags;
548
540
int ret;
549
541
550
-
ret = pm_runtime_get_sync(bdev->dev);
542
+
ret = bam_pm_runtime_get_sync(bdev->dev);
551
543
if (ret < 0)
552
544
return;
553
545
···
728
720
unsigned long flag;
729
721
int ret;
730
722
731
-
ret = pm_runtime_get_sync(bdev->dev);
723
+
ret = bam_pm_runtime_get_sync(bdev->dev);
732
724
if (ret < 0)
733
725
return ret;
734
726
···
754
746
unsigned long flag;
755
747
int ret;
756
748
757
-
ret = pm_runtime_get_sync(bdev->dev);
749
+
ret = bam_pm_runtime_get_sync(bdev->dev);
758
750
if (ret < 0)
759
751
return ret;
760
752
···
860
852
if (srcs & P_IRQ)
861
853
tasklet_schedule(&bdev->task);
862
854
863
-
ret = pm_runtime_get_sync(bdev->dev);
855
+
ret = bam_pm_runtime_get_sync(bdev->dev);
864
856
if (ret < 0)
865
857
return ret;
866
858
···
977
969
if (!vd)
978
970
return;
979
971
980
-
ret = pm_runtime_get_sync(bdev->dev);
972
+
ret = bam_pm_runtime_get_sync(bdev->dev);
981
973
if (ret < 0)
982
974
return;
983
975