Skip to content

Commit

Permalink
ASoC: samsung: spdif: Fix DMA filter initialization
Browse files Browse the repository at this point in the history
This patch fixes issues introduced in commit 73f5dfc
"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>
  • Loading branch information
Sylwester Nawrocki authored and Mark Brown committed Nov 2, 2016
1 parent 73f5dfc commit a451332
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions sound/soc/samsung/spdif.c
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,15 @@ static int spdif_probe(struct platform_device *pdev)
goto err3;
}

spdif_stereo_out.addr_width = 2;
spdif_stereo_out.addr = mem_res->start + DATA_OUTBUF;
filter = NULL;
if (spdif_pdata) {
spdif_stereo_out.filter_data = spdif_pdata->dma_playback;
filter = spdif_pdata->dma_filter;
}
spdif->dma_playback = &spdif_stereo_out;

ret = samsung_asoc_dma_platform_register(&pdev->dev, filter,
NULL, NULL);
if (ret) {
Expand All @@ -432,16 +441,6 @@ static int spdif_probe(struct platform_device *pdev)
goto err4;
}

spdif_stereo_out.addr_width = 2;
spdif_stereo_out.addr = mem_res->start + DATA_OUTBUF;
filter = NULL;
if (spdif_pdata) {
spdif_stereo_out.filter_data = spdif_pdata->dma_playback;
filter = spdif_pdata->dma_filter;
}

spdif->dma_playback = &spdif_stereo_out;

return 0;
err4:
iounmap(spdif->regs);
Expand Down

0 comments on commit a451332

Please sign in to comment.