mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +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> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
parent
77ee09c67e
commit
b8e22c1fe3
1 changed files with 3 additions and 3 deletions
|
@ -221,6 +221,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,
|
||||
|
@ -234,9 +237,6 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
|
|||
gpio_export(gpios[i].gpio, false);
|
||||
#endif
|
||||
|
||||
INIT_WORK(&gpios[i].work, gpio_work);
|
||||
gpios[i].jack = jack;
|
||||
|
||||
/* Update initial jack status */
|
||||
snd_soc_jack_gpio_detect(&gpios[i]);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue