diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-26 10:43:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-26 10:43:25 -0800 |
| commit | 23db0ed34f9e3756d243c5dc56d9f7c1fadecf89 (patch) | |
| tree | 4dddbb116b4fd333c6d95363f3877be5f67f9df0 /drivers/dma/dw/acpi.c | |
| parent | 6fcb22ef50b47959e17012be57dcad0fdca8d237 (diff) | |
| parent | ebc008699fd95701c9af5ebaeb0793eef81a71d5 (diff) | |
| download | linux-23db0ed34f9e3756d243c5dc56d9f7c1fadecf89.tar.gz linux-23db0ed34f9e3756d243c5dc56d9f7c1fadecf89.tar.bz2 linux-23db0ed34f9e3756d243c5dc56d9f7c1fadecf89.zip | |
Merge tag 'dmaengine-fix-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine
Pull dmaengine fixes from Vinod Koul:
"Bunch of minor driver fixes for drivers in this cycle:
- Kernel doc warning documentation fixes
- apple driver fix for register access
- amd driver dropping private dma_ops
- freescale cleanup path fix
- refcount fix for mv_xor driver
- null pointer deref fix for at_xdmac driver
- GENMASK to GENMASK_ULL fix for loongson2 apb driver
- Tegra driver fix for correcting dma status"
* tag 'dmaengine-fix-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine:
dmaengine: tegra: Return correct DMA status when paused
dmaengine: mv_xor: fix child node refcount handling in early exit
dmaengine: fsl-edma: implement the cleanup path of fsl_edma3_attach_pd()
dmaengine: amd: qdma: Remove using the private get and set dma_ops APIs
dmaengine: apple-admac: Avoid accessing registers in probe
linux/dmaengine.h: fix a few kernel-doc warnings
dmaengine: loongson2-apb: Change GENMASK to GENMASK_ULL
dmaengine: dw: Select only supported masters for ACPI devices
dmaengine: at_xdmac: avoid null_prt_deref in at_xdmac_prep_dma_memset
Diffstat (limited to 'drivers/dma/dw/acpi.c')
| -rw-r--r-- | drivers/dma/dw/acpi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dma/dw/acpi.c b/drivers/dma/dw/acpi.c index c510c109d2c3..b6452fffa657 100644 --- a/drivers/dma/dw/acpi.c +++ b/drivers/dma/dw/acpi.c @@ -8,13 +8,15 @@ static bool dw_dma_acpi_filter(struct dma_chan *chan, void *param) { + struct dw_dma *dw = to_dw_dma(chan->device); + struct dw_dma_chip_pdata *data = dev_get_drvdata(dw->dma.dev); struct acpi_dma_spec *dma_spec = param; struct dw_dma_slave slave = { .dma_dev = dma_spec->dev, .src_id = dma_spec->slave_id, .dst_id = dma_spec->slave_id, - .m_master = 0, - .p_master = 1, + .m_master = data->m_master, + .p_master = data->p_master, }; return dw_dma_filter(chan, &slave); |