From 2d161c4b1e4611cdb28eb4d5778a3602a55af3a3 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 10 May 2010 16:13:11 +0100 Subject: [PATCH] --- yaml --- r: 193465 b: refs/heads/master c: 6adb26bd03f6056357298bc29d5c6acdea2b216a h: refs/heads/master i: 193463: c543bb17c152f79a9647a44148493d754c071ca5 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm_hubs.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 26360a686373..4c516ddae3aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3254d2850075c88083d870b3ee5e1ce0922cd3d9 +refs/heads/master: 6adb26bd03f6056357298bc29d5c6acdea2b216a diff --git a/trunk/sound/soc/codecs/wm_hubs.c b/trunk/sound/soc/codecs/wm_hubs.c index 8ad43bb32eb0..16f1a57da08a 100644 --- a/trunk/sound/soc/codecs/wm_hubs.c +++ b/trunk/sound/soc/codecs/wm_hubs.c @@ -401,14 +401,14 @@ static int hp_event(struct snd_soc_dapm_widget *w, case SND_SOC_DAPM_PRE_PMD: snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, - WM8993_HPOUT1L_DLY | - WM8993_HPOUT1R_DLY | + WM8993_HPOUT1L_OUTP | + WM8993_HPOUT1R_OUTP | WM8993_HPOUT1L_RMV_SHORT | WM8993_HPOUT1R_RMV_SHORT, 0); snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, - WM8993_HPOUT1L_OUTP | - WM8993_HPOUT1R_OUTP, 0); + WM8993_HPOUT1L_DLY | + WM8993_HPOUT1R_DLY, 0); snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,