diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:28:54 -0400 |
| commit | b7e8bbf29d9c90a301ca0060186af687992566d8 (patch) | |
| tree | e59fc4cdac1eea246b808d247be6668bfb48ed4c | |
| parent | 3efdb7f68530d783af73f6f547744d410d621ab7 (diff) | |
| parent | a06e427d088d8a9b81defd42e6bae5f1cd69fc3f (diff) | |
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
| -rw-r--r-- | sound/soc/codecs/twl6040.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c index d6c5bf14179a..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) | |||
| 429 | struct snd_soc_codec *codec = data; | 429 | struct snd_soc_codec *codec = data; |
| 430 | struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); | 430 | struct twl6040_data *priv = snd_soc_codec_get_drvdata(codec); |
| 431 | 431 | ||
| 432 | schedule_delayed_work(&priv->hs_jack.work, msecs_to_jiffies(200)); | 432 | queue_delayed_work(system_power_efficient_wq, |
| 433 | &priv->hs_jack.work, msecs_to_jiffies(200)); | ||
| 433 | 434 | ||
| 434 | return IRQ_HANDLED; | 435 | return IRQ_HANDLED; |
| 435 | } | 436 | } |