ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code
PATCH 1/1 ALSA: ice1724: Fix sleep-in-atomic in Infrasonic Quartet support code
Jia-Ju Bai reported a possible sleep-in-atomic scenario in the ice1724 driver with Infrasonic Quartet support code: namely, ice->set_rate callback gets called inside ice->reg_lock spinlock, while the callback in quartet.c holds ice->gpio_mutex.
This patch fixes the invalid call: it simply moves the calls of ice->set_rate and ice->set_mclk callbacks outside the spinlock.
Reported-by Jia-Ju Bai <[email protected]>
Cc <[email protected]>
Signed-off-by Takashi Iwai <[email protected]>
--- sound/pci/ice1712/ice1724.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
sound/pci/ice1712/ice1724.c +6 -3
@@ -647,6 +647,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,unsigned long flags;unsigned char mclk_change;unsigned int i, old_rate; +bool call_set_rate = false;if (rate > ice->hw_rates->list[ice->hw_rates->count -1 ])return -EINVAL ;
@@ -670,7 +671,7 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate,* setting clock rate for internal clock mode */ old_rate = ice->get_rate (ice);if (force || (old_rate != rate)) - ice->set_rate (ice, rate); + call_set_rate = true;else if (rate == ice->cur_rate) {spin_unlock_irqrestore (&ice->reg_lock, flags);return 0 ;
@@ -678,12 +679,14 @@ static int snd_vt1724_set_pro_rate(struct snd_ice1712 *ice, unsigned int rate, } ice->cur_rate = rate; +spin_unlock_irqrestore (&ice->reg_lock, flags); + +if (call_set_rate) + ice->set_rate (ice, rate);/* setting master clock */ mclk_change = ice->set_mclk (ice, rate); -spin_unlock_irqrestore (&ice->reg_lock, flags); -if (mclk_change && ice->gpio.i2s_mclk_changed) ice->gpio.i2s_mclk_changed (ice);if (ice->gpio.set_pro_rate)
Signature · 6 lines
2.16.4 _______________________________________________ Alsa-devel mailing list [email protected] https://mailman.alsa-project.org/mailman/listinfo/alsa-devel