Merge tag 'sound-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / fsl / fsl_asrc_dma.c

diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c
index 29f91cdecbc33142ca1a0b7f8b1c132601c9a166..c313a26c8f95547173704e226ee27d363e156651 100644 (file)
--- a/sound/soc/fsl/fsl_asrc_dma.c
+++ b/sound/soc/fsl/fsl_asrc_dma.c
@@ -141,6 +141,7 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
        struct dma_slave_config config_fe, config_be;
        enum asrc_pair_index index = pair->index;
        struct device *dev = component->dev;
+       struct device_node *of_dma_node;
        int stream = substream->stream;
        struct imx_dma_data *tmp_data;
        struct snd_soc_dpcm *dpcm;
@@ -231,8 +232,10 @@ static int fsl_asrc_dma_hw_params(struct snd_soc_component *component,
                pair->dma_data.priority = tmp_data->priority;
                dma_release_channel(tmp_chan);
 
+               of_dma_node = pair->dma_chan[!dir]->device->dev->of_node;
                pair->dma_chan[dir] =
-                       dma_request_channel(mask, filter, &pair->dma_data);
+                       __dma_request_channel(&mask, filter, &pair->dma_data,
+                                             of_dma_node);
                pair->req_dma_chan = true;
        } else {
                pair->dma_chan[dir] = tmp_chan;