diff options
author | Mark Brown <broonie@linaro.org> | 2013-08-22 09:29:02 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-08-22 09:29:02 -0400 |
commit | 7254a2212fe934c9786a248fd15c43dcb855eb18 (patch) | |
tree | 12893e56f85c484cdb0ee3d015e80e444d61c323 | |
parent | 5f081e1ebbf8e4a52a68e9443903bf5e223c72ed (diff) | |
parent | da72c9619f4df033d431a0a4cee715cf14c78433 (diff) |
Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next
-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 e2de9ecfd641..36782f067cc5 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, | |||
2621 | 2621 | ||
2622 | wm8962->sysclk_rate = freq; | 2622 | wm8962->sysclk_rate = freq; |
2623 | 2623 | ||
2624 | wm8962_configure_bclk(codec); | ||
2625 | |||
2626 | return 0; | 2624 | return 0; |
2627 | } | 2625 | } |
2628 | 2626 | ||
@@ -3046,8 +3044,9 @@ static irqreturn_t wm8962_irq(int irq, void *data) | |||
3046 | 3044 | ||
3047 | pm_wakeup_event(dev, 300); | 3045 | pm_wakeup_event(dev, 300); |
3048 | 3046 | ||
3049 | schedule_delayed_work(&wm8962->mic_work, | 3047 | queue_delayed_work(system_power_efficient_wq, |
3050 | msecs_to_jiffies(250)); | 3048 | &wm8962->mic_work, |
3049 | msecs_to_jiffies(250)); | ||
3051 | } | 3050 | } |
3052 | 3051 | ||
3053 | return IRQ_HANDLED; | 3052 | return IRQ_HANDLED; |