ASoC: samsung: spdif: Fix DMA filter initialization (a4513320) · Commits · 戴 / test

This patch fixes issues introduced in commit "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>

sound/soc/samsung/spdif.c

+9 −10

Original line number	Diff line number	Diff line
		@@ -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) {
		@@ -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);

Admin message