diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2016-11-02 07:03:03 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-11-02 11:15:27 -0400 |
commit | a4513320423a388ed55eb0754353f46b10d05a99 (patch) | |
tree | 87f3e0b141d6bce3654ee0f3bc907e5d8cedb845 | |
parent | 73f5dfc68316bef2ab7062ecdefd4b0ca941b4c1 (diff) |
ASoC: samsung: spdif: Fix DMA filter initialization
This patch fixes issues introduced in commit 73f5dfc68316bef2ab7062ec
"ASoC: samsung: get access to DMA engine early to defer probe properly"
and indicated by a following compilation warning:
CC [M] sound/soc/samsung/spdif.o
sound/soc/samsung/spdif.c: In function ‘spdif_probe’:
sound/soc/samsung/spdif.c:419:6: warning: ‘filter’ may be used uninitialized
in this function [-Wuninitialized]
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/samsung/spdif.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/sound/soc/samsung/spdif.c b/sound/soc/samsung/spdif.c index 704b7b12bf8b..779504f54bc0 100644 --- a/sound/soc/samsung/spdif.c +++ b/sound/soc/samsung/spdif.c | |||
@@ -416,6 +416,15 @@ static int spdif_probe(struct platform_device *pdev) | |||
416 | goto err3; | 416 | goto err3; |
417 | } | 417 | } |
418 | 418 | ||
419 | spdif_stereo_out.addr_width = 2; | ||
420 | spdif_stereo_out.addr = mem_res->start + DATA_OUTBUF; | ||
421 | filter = NULL; | ||
422 | if (spdif_pdata) { | ||
423 | spdif_stereo_out.filter_data = spdif_pdata->dma_playback; | ||
424 | filter = spdif_pdata->dma_filter; | ||
425 | } | ||
426 | spdif->dma_playback = &spdif_stereo_out; | ||
427 | |||
419 | ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, | 428 | ret = samsung_asoc_dma_platform_register(&pdev->dev, filter, |
420 | NULL, NULL); | 429 | NULL, NULL); |
421 | if (ret) { | 430 | if (ret) { |
@@ -432,16 +441,6 @@ static int spdif_probe(struct platform_device *pdev) | |||
432 | goto err4; | 441 | goto err4; |
433 | } | 442 | } |
434 | 443 | ||
435 | spdif_stereo_out.addr_width = 2; | ||
436 | spdif_stereo_out.addr = mem_res->start + DATA_OUTBUF; | ||
437 | filter = NULL; | ||
438 | if (spdif_pdata) { | ||
439 | spdif_stereo_out.filter_data = spdif_pdata->dma_playback; | ||
440 | filter = spdif_pdata->dma_filter; | ||
441 | } | ||
442 | |||
443 | spdif->dma_playback = &spdif_stereo_out; | ||
444 | |||
445 | return 0; | 444 | return 0; |
446 | err4: | 445 | err4: |
447 | iounmap(spdif->regs); | 446 | iounmap(spdif->regs); |