Commit 04143d61 authored by Maciej S. Szmigiero's avatar Maciej S. Szmigiero Committed by Mark Brown
Browse files

ASoC: fsl_ssi: add AC'97 ops setting check and cleanup 



Check whether setting AC'97 ops succeeded and clean them
on removal so the fsl_ssi driver can be reloaded.

Signed-off-by: default avatarMaciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 06cb3736

sound/soc/fsl/fsl_ssi.c

+8 −1
Original line number Diff line number Diff line
@@ -1340,7 +1340,11 @@ static int fsl_ssi_probe(struct platform_device *pdev) 


		fsl_ac97_data = ssi_private;



		snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev);

		ret = snd_soc_set_ac97_ops_of_reset(&fsl_ssi_ac97_ops, pdev);

		if (ret) {

			dev_err(&pdev->dev, "could not set AC'97 ops\n");

			return ret;

		}

	} else {

		/* Initialize this copy of the CPU DAI driver structure */

		memcpy(&ssi_private->cpu_dai_drv, &fsl_ssi_dai_template,
@@ -1480,6 +1484,9 @@ static int fsl_ssi_remove(struct platform_device *pdev) 
	if (ssi_private->soc->imx)

		fsl_ssi_imx_clean(pdev, ssi_private);



	if (fsl_ssi_is_ac97(ssi_private))

		snd_soc_set_ac97_ops(NULL);



	return 0;

}