From 5c3fa29bbb87aa7a0157464b5ee70be3ac1a46dc Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Thu, 13 Oct 2011 15:05:44 +0300 Subject: [PATCH] --- yaml --- r: 270865 b: refs/heads/master c: 694b00010b0dfe727d485c3472cfe3ad7b91dcc2 h: refs/heads/master i: 270863: 895c7558f6da0917c08d04fe8274e164ef57bf2d v: v3 --- [refs] | 2 +- trunk/sound/soc/codecs/twl6040.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eca70bbabcc7..30cdd9f98f53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aa1a41082fb8c47893186103bf53e96708041e1c +refs/heads/master: 694b00010b0dfe727d485c3472cfe3ad7b91dcc2 diff --git a/trunk/sound/soc/codecs/twl6040.c b/trunk/sound/soc/codecs/twl6040.c index eadece8f0164..6c573c355d28 100644 --- a/trunk/sound/soc/codecs/twl6040.c +++ b/trunk/sound/soc/codecs/twl6040.c @@ -673,7 +673,7 @@ static int twl6040_hs_dac_event(struct snd_soc_dapm_widget *w, return 0; } -static int twl6040_power_mode_event(struct snd_soc_dapm_widget *w, +static int twl6040_ep_drv_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { struct snd_soc_codec *codec = w->codec; @@ -1163,7 +1163,7 @@ static const struct snd_soc_dapm_widget twl6040_dapm_widgets[] = { SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), SND_SOC_DAPM_OUT_DRV_E("Earphone Driver", TWL6040_REG_EARCTL, 0, 0, NULL, 0, - twl6040_power_mode_event, + twl6040_ep_drv_event, SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_OUT_DRV("Vibra Left Driver", TWL6040_REG_VIBCTLL, 0, 0, NULL, 0),