diff options
| author |   Sylwester Nawrocki <s.nawrocki@samsung.com> | 2016-07-21 20:03:50 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-07-21 19:18:17 +0100 |
| commit | 42a74e77471ea42e6ab44e5be16723ede72b9901 (patch) | |
| tree | 6be321ee4782af38a420aad1ccbd7e8fd83cb702 /sound/soc/samsung/s3c24xx-i2s.c | |
| parent | ASoC: samsung: Fix error paths in the I2S driver's probe() (diff) | |
| download | wireguard-linux-42a74e77471ea42e6ab44e5be16723ede72b9901.tar.xz wireguard-linux-42a74e77471ea42e6ab44e5be16723ede72b9901.zip | |
ASoC: samsung: Specify DMA channels through struct snd_dmaengine_pcm_config
The DMA channel names are specified through struct snd_dmaengine_pcm_config
rather than using SND_DMAENGINE_PCM_FLAG_CUSTOM_CHANNEL_NAME flag when
booting with devicetree in order to properly support deferred probing.
Without this change the sound machine driver initialization can complete
successfully with unavailable DMA resources.
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/samsung/s3c24xx-i2s.c')
| -rw-r--r-- | sound/soc/samsung/s3c24xx-i2s.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/samsung/s3c24xx-i2s.c b/sound/soc/samsung/s3c24xx-i2s.c index b3a475d73ba7..3e76f2a75a24 100644 --- a/sound/soc/samsung/s3c24xx-i2s.c +++ b/sound/soc/samsung/s3c24xx-i2s.c @@ -482,7 +482,8 @@ static int s3c24xx_iis_dev_probe(struct platform_device *pdev) } ret = samsung_asoc_dma_platform_register(&pdev->dev, - pdata->dma_filter); + pdata->dma_filter, + NULL, NULL); if (ret) pr_err("failed to register the dma: %d\n", ret); |