openwrtv4/target/linux/generic-2.6/patches-2.6.30/780-fix-race-in-snd_soc_jack_add_gpios.patch

36 lines
1 KiB
Diff
Raw Normal View History

2009-08-01 13:35:17 +00:00
commit 5ced436d549d911ce610ea47d85f71fae5bbfce4
Author: Lars-Peter Clausen <lars@metafoo.de>
Date: Fri Jul 31 18:26:48 2009 +0200
2009-08-01 13:35:17 +00:00
ASoC: jack: Fix race in snd_soc_jack_add_gpios
The irq can fire as soon as it has been requested, thus all fields accessed
from within the irq handler must be initialized prior to requesting the irq.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
2009-08-01 13:35:17 +00:00
index 28346fb..639333a 100644
--- a/sound/soc/soc-jack.c
+++ b/sound/soc/soc-jack.c
2009-08-01 13:35:17 +00:00
@@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
if (ret)
goto err;
+ INIT_WORK(&gpios[i].work, gpio_work);
+ gpios[i].jack = jack;
+
ret = request_irq(gpio_to_irq(gpios[i].gpio),
gpio_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
2009-08-01 13:35:17 +00:00
@@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
&gpios[i]);
if (ret)
goto err;
-
- INIT_WORK(&gpios[i].work, gpio_work);
- gpios[i].jack = jack;
}
2009-08-01 13:35:17 +00:00
return 0;