diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-02 12:32:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-01-02 12:32:11 +0300 |
| commit | 57ca536884f7a0df09d5a1bd8fdcf024f9f47788 (patch) | |
| tree | bb3150a1d9e3addda784aa34eac6766e4383390c /drivers/dma/dw/acpi.c | |
| parent | 54a55315ba309aed30635237c8d1c94e3c817e65 (diff) | |
| parent | a30cd70ab75aa6b7ee880b6ec2ecc492faf205b2 (diff) | |
| download | linux-57ca536884f7a0df09d5a1bd8fdcf024f9f47788.tar.xz | |
Merge v6.6.69linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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); |