Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"Back from long weekend here in India and now the time to send fixes
for slave dmaengine.
- Dan's fix of sirf xlate code
- Jean's fix for timberland
- edma fixes by Sekhar for SG handling and Yuan for changing init
call"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: fix eDMA driver as a subsys_initcall
dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
platform: Fix timberdale dependencies
dma: edma: fix incorrect SG list handling
+18
-6
+1
-1
drivers/dma/Kconfig
+1
-1
drivers/dma/Kconfig
+4
-2
drivers/dma/edma.c
+4
-2
drivers/dma/edma.c
···
182
182
echan->ecc->dummy_slot);
183
183
}
184
184
185
-
edma_resume(echan->ch_num);
186
-
187
185
if (edesc->processed <= MAX_NR_SG) {
188
186
dev_dbg(dev, "first transfer starting %d\n", echan->ch_num);
189
187
edma_start(echan->ch_num);
188
+
} else {
189
+
dev_dbg(dev, "chan: %d: completed %d elements, resuming\n",
190
+
echan->ch_num, edesc->processed);
191
+
edma_resume(echan->ch_num);
190
192
}
191
193
192
194
/*
+11
-1
drivers/dma/fsl-edma.c
+11
-1
drivers/dma/fsl-edma.c
···
968
968
.remove = fsl_edma_remove,
969
969
};
970
970
971
-
module_platform_driver(fsl_edma_driver);
971
+
static int __init fsl_edma_init(void)
972
+
{
973
+
return platform_driver_register(&fsl_edma_driver);
974
+
}
975
+
subsys_initcall(fsl_edma_init);
976
+
977
+
static void __exit fsl_edma_exit(void)
978
+
{
979
+
platform_driver_unregister(&fsl_edma_driver);
980
+
}
981
+
module_exit(fsl_edma_exit);
972
982
973
983
MODULE_ALIAS("platform:fsl-edma");
974
984
MODULE_DESCRIPTION("Freescale eDMA engine driver");
+1
-1
drivers/dma/sirf-dma.c
+1
-1
drivers/dma/sirf-dma.c
+1
-1
drivers/media/platform/Kconfig
+1
-1
drivers/media/platform/Kconfig