Commit 0f260fd5 authored by Sascha Hauer's avatar Sascha Hauer Committed by Ben Hutchings

ASoC: imx-ssi: Fix occasional AC97 reset failure

commit b6e51600 upstream.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
[bwh: Backported to 3.2: adjust filename]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 7161ab99
...@@ -573,6 +573,8 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97) ...@@ -573,6 +573,8 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97)
if (imx_ssi->ac97_reset) if (imx_ssi->ac97_reset)
imx_ssi->ac97_reset(ac97); imx_ssi->ac97_reset(ac97);
/* First read sometimes fails, do a dummy read */
imx_ssi_ac97_read(ac97, 0);
} }
static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
...@@ -581,6 +583,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97) ...@@ -581,6 +583,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
if (imx_ssi->ac97_warm_reset) if (imx_ssi->ac97_warm_reset)
imx_ssi->ac97_warm_reset(ac97); imx_ssi->ac97_warm_reset(ac97);
/* First read sometimes fails, do a dummy read */
imx_ssi_ac97_read(ac97, 0);
} }
struct snd_ac97_bus_ops soc_ac97_ops = { struct snd_ac97_bus_ops soc_ac97_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment