Commit 7254a221 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next

parents 5f081e1e da72c961
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment