lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: jack: Fix race in snd_soc_jack_add_gpios

Browse Source 
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>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Lars-Peter Clausen
2009-07-31 21:15:25 +02:00
committed by Mark Brown
parent 77ee09c67e
commit b8e22c1fe3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/soc-jack.c
View File

@@ -221,6 +221,9 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
if (ret) if (ret)
goto err; goto err;
INIT_WORK(&gpios[i].work, gpio_work);
gpios[i].jack = jack;
ret = request_irq(gpio_to_irq(gpios[i].gpio), ret = request_irq(gpio_to_irq(gpios[i].gpio),
gpio_handler, gpio_handler,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
@@ -234,9 +237,6 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
gpio_export(gpios[i].gpio, false); gpio_export(gpios[i].gpio, false);
#endif #endif
INIT_WORK(&gpios[i].work, gpio_work);
gpios[i].jack = jack;
/* Update initial jack status */ /* Update initial jack status */
snd_soc_jack_gpio_detect(&gpios[i]); snd_soc_jack_gpio_detect(&gpios[i]);
} }