From 71c8b2944f09b3f72e7871d351cb170cbdc080f6 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Thu, 18 Mar 2010 12:25:35 +0000 Subject: [PATCH] --- yaml --- r: 188935 b: refs/heads/master c: 6937c947d31186750f72c9f8c942bbcc6fe63585 h: refs/heads/master i: 188933: a3958ab0fb4a3c34d165f18df0a92ef76cad0aba 188931: 50d50d189a357a9c8b3e453a3e724ee2e382414e 188927: 7056ffa98e2521b71508afa7844e7cee4ee8f370 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm_hubs.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 8cfd5720375e..6290587344e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdb6b1e195757a66670801702e4b5fcc66ed3d72 +refs/heads/master: 6937c947d31186750f72c9f8c942bbcc6fe63585 diff --git a/trunk/sound/soc/codecs/wm_hubs.c b/trunk/sound/soc/codecs/wm_hubs.c index 0ad9f5d536c6..486bdd21a98a 100644 --- a/trunk/sound/soc/codecs/wm_hubs.c +++ b/trunk/sound/soc/codecs/wm_hubs.c @@ -74,7 +74,7 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec) msleep(1); reg = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_0); dev_dbg(codec->dev, "DC servo: %x\n", reg); - } while (reg & WM8993_DCS_DATAPATH_BUSY); + } while (reg & WM8993_DCS_DATAPATH_BUSY && count < 400); if (reg & WM8993_DCS_DATAPATH_BUSY) dev_err(codec->dev, "Timed out waiting for DC Servo\n");