summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-03-10 19:33:03 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-12 18:53:38 +0000
commitb6e51600f4e983e757b1b6942becaa1ae7d82e67 (patch)
tree7bf391519e9b205792c20d784f03ae1a4d7c5aca /sound
parentf6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff)
downloadlinux-stable-b6e51600f4e983e757b1b6942becaa1ae7d82e67.tar.gz
linux-stable-b6e51600f4e983e757b1b6942becaa1ae7d82e67.tar.bz2
linux-stable-b6e51600f4e983e757b1b6942becaa1ae7d82e67.zip
ASoC: imx-ssi: Fix occasional AC97 reset failure
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Markus Pargmann <mpa@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/imx-ssi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index 55464a5b0706..810c7eeb7b03 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -496,6 +496,8 @@ static void imx_ssi_ac97_reset(struct snd_ac97 *ac97)
if (imx_ssi->ac97_reset)
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)
@@ -504,6 +506,9 @@ static void imx_ssi_ac97_warm_reset(struct snd_ac97 *ac97)
if (imx_ssi->ac97_warm_reset)
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 = {