Merge branch 'for-5.6' of... (cc6eb9b5) · Commits · 戴 / test

sound/soc/stm/stm32_sai_sub.c

+11 −9

Original line number	Diff line number	Diff line
		@@ -1547,7 +1547,14 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
		return ret;
		}

		ret = devm_snd_soc_register_component(&pdev->dev, &stm32_component,
		ret = snd_dmaengine_pcm_register(&pdev->dev, conf, 0);
		if (ret) {
		if (ret != -EPROBE_DEFER)
		dev_err(&pdev->dev, "Could not register pcm dma\n");
		return ret;
		}

		ret = snd_soc_register_component(&pdev->dev, &stm32_component,
		&sai->cpu_dai_drv, 1);
		if (ret)
		return ret;
		@@ -1555,13 +1562,6 @@ static int stm32_sai_sub_probe(struct platform_device *pdev)
		if (STM_SAI_PROTOCOL_IS_SPDIF(sai))
		conf = &stm32_sai_pcm_config_spdif;

		ret = devm_snd_dmaengine_pcm_register(&pdev->dev, conf, 0);
		if (ret) {
		if (ret != -EPROBE_DEFER)
		dev_err(&pdev->dev, "PCM DMA register error %d\n", ret);
		return ret;
		}

		return 0;
		}

		@@ -1570,6 +1570,8 @@ static int stm32_sai_sub_remove(struct platform_device *pdev)
		struct stm32_sai_sub_data *sai = dev_get_drvdata(&pdev->dev);

		clk_unprepare(sai->pdata->pclk);
		snd_dmaengine_pcm_unregister(&pdev->dev);
		snd_soc_unregister_component(&pdev->dev);

		return 0;
		}