From 7da994be6353272c159f911002a43f14c9d5cd61 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 21 Feb 2012 09:36:49 +0000 Subject: [PATCH] --- yaml --- r: 293389 b: refs/heads/master c: 26422625d55d94f60e48fa62e05f3b5aa5ad98f4 h: refs/heads/master i: 293387: 48a0cb518b3015637714f1b2f14c347c20c23e86 v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/wm_hubs.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 20ac3a9530b9..f9993d7d6732 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdd48f9d1961d579ded4d820348af5f3f0f94463 +refs/heads/master: 26422625d55d94f60e48fa62e05f3b5aa5ad98f4 diff --git a/trunk/sound/soc/codecs/wm_hubs.c b/trunk/sound/soc/codecs/wm_hubs.c index 9742c666cd0a..82b7e9dece2c 100644 --- a/trunk/sound/soc/codecs/wm_hubs.c +++ b/trunk/sound/soc/codecs/wm_hubs.c @@ -670,9 +670,8 @@ SND_SOC_DAPM_PGA("Right Output PGA", WM8993_POWER_MANAGEMENT_3, 6, 0, NULL, 0), SND_SOC_DAPM_SUPPLY("Headphone Supply", SND_SOC_NOPM, 0, 0, hp_supply_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD), -SND_SOC_DAPM_PGA_E("Headphone PGA", SND_SOC_NOPM, 0, 0, - NULL, 0, - hp_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), +SND_SOC_DAPM_OUT_DRV_E("Headphone PGA", SND_SOC_NOPM, 0, 0, NULL, 0, + hp_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_MIXER("Earpiece Mixer", SND_SOC_NOPM, 0, 0, earpiece_mixer, ARRAY_SIZE(earpiece_mixer)),