Merge commit 'v2.6.37-rc1' into for-2.6.37

[pandora-kernel.git] / sound / soc / codecs / wm_hubs.c

diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c
index 16f1a57..19ca782 100644 (file)
--- a/sound/soc/codecs/wm_hubs.c
+++ b/sound/soc/codecs/wm_hubs.c
@@ -123,7 +123,7 @@ static void calibrate_dc_servo(struct snd_soc_codec *codec)
                        reg_r = reg & WM8993_DCS_DAC_WR_VAL_0_MASK;
                        break;
                default:
-                       WARN(1, "Unknown DCS readback method");
+                       WARN(1, "Unknown DCS readback method\n");
                        break;
                }
 
@@ -410,6 +410,8 @@ static int hp_event(struct snd_soc_dapm_widget *w,
                                    WM8993_HPOUT1L_DLY |
                                    WM8993_HPOUT1R_DLY, 0);
 
+               snd_soc_write(codec, WM8993_DC_SERVO_0, 0);
+
                snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1,
                                    WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,
                                    0);