diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-11 11:17:14 +0100 |
| commit | 29dc5dd229dc3130b51df0932e59946fc09d3bd4 (patch) | |
| tree | 51fbe8eb543fc4fd3f8ee6582bdc72ea0bccee6f /sound/soc/codecs/twl6040.c | |
| parent | 6e4664525b1db28f8c4e1130957f70a94c19213e (diff) | |
| parent | e011143454606de70eba1db5d99454eec0017fdb (diff) | |
Merge remote-tracking branch 'asoc/fix/atmel' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index 44621ddc332d..3c79dbb6c323 100644 --- a/sound/soc/codecs/twl6040.c +++ b/sound/soc/codecs/twl6040.c @@ -429,7 +429,8 @@ static irqreturn_t twl6040_audio_handler(int irq, void *data) struct snd_soc_codec *codec = data; struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); - schedule_delayed_work(&priv->hs_jack.work, msecs_to_jiffies(200)); + queue_delayed_work(system_power_efficient_wq, + &priv->hs_jack.work, msecs_to_jiffies(200)); return IRQ_HANDLED; } @@ -437,9 +438,7 @@ static irqreturn_t twl6040_audio_handler(int irq, void *data) static int twl6040_soc_dapm_put_vibra_enum(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_soc_dapm_widget_list *wlist = snd_kcontrol_chip(kcontrol); - struct snd_soc_dapm_widget *widget = wlist->widgets[0]; - struct snd_soc_codec *codec = widget->codec; + struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol); struct soc_enum *e = (struct soc_enum *)kcontrol->private_value; unsigned int val; |