From 0d0b93fa0924eb5d4ae81e8fd7eea0b399eddc72 Mon Sep 17 00:00:00 2001 From: Grant Likely Date: Thu, 2 Jul 2009 11:57:19 -0600 Subject: [PATCH] --- yaml --- r: 155319 b: refs/heads/master c: 07573534b0b030226ee5ab560e53aac7e6c0dd84 h: refs/heads/master i: 155317: 06ec3b8b488e5430d0021e0fe4c251fa42ad4ee6 155315: d3ec8e9089b2446e23bd1b957de3434e27d2eed1 155311: a75926f061d146e7a988dd6927180f932c35f664 v: v3 --- [refs] | 2 +- trunk/sound/soc/fsl/mpc5200_psc_ac97.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 349e5e2ea056..ac58cc2f4201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1df892cba45f9856d369a6a317ad2d1e44bca423 +refs/heads/master: 07573534b0b030226ee5ab560e53aac7e6c0dd84 diff --git a/trunk/sound/soc/fsl/mpc5200_psc_ac97.c b/trunk/sound/soc/fsl/mpc5200_psc_ac97.c index 794a247b3eb5..9b8503f2d68c 100644 --- a/trunk/sound/soc/fsl/mpc5200_psc_ac97.c +++ b/trunk/sound/soc/fsl/mpc5200_psc_ac97.c @@ -41,6 +41,10 @@ static unsigned short psc_ac97_read(struct snd_ac97 *ac97, unsigned short reg) pr_err("timeout on ac97 bus (rdy)\n"); return -ENODEV; } + + /* Force clear the data valid bit */ + in_be32(&psc_dma->psc_regs->ac97_data); + /* Send the read */ out_be32(&psc_dma->psc_regs->ac97_cmd, (1<<31) | ((reg & 0x7f) << 24));