diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-22 13:29:02 (GMT) |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-22 13:29:02 (GMT) |
| commit | 7254a2212fe934c9786a248fd15c43dcb855eb18 (patch) | |
| tree | 12893e56f85c484cdb0ee3d015e80e444d61c323 /sound/soc | |
| parent | 5f081e1ebbf8e4a52a68e9443903bf5e223c72ed (diff) | |
| parent | da72c9619f4df033d431a0a4cee715cf14c78433 (diff) | |
| download | linux-7254a2212fe934c9786a248fd15c43dcb855eb18.tar.xz | |
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/wm8962.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index e2de9ec..36782f0 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c @@ -2621,8 +2621,6 @@ static int wm8962_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, wm8962->sysclk_rate = freq; - wm8962_configure_bclk(codec); - return 0; } @@ -3046,8 +3044,9 @@ static irqreturn_t wm8962_irq(int irq, void *data) pm_wakeup_event(dev, 300); - schedule_delayed_work(&wm8962->mic_work, - msecs_to_jiffies(250)); + queue_delayed_work(system_power_efficient_wq, + &wm8962->mic_work, + msecs_to_jiffies(250)); } return IRQ_HANDLED; |