diff options
| author |   Lars-Peter Clausen <lars@metafoo.de> | 2009-07-31 21:15:25 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-07-31 22:38:43 +0100 |
| commit | b8e22c1fe375a8c3b3e4fd7c569cb8932607bef3 (patch) | |
| tree | 1295dc0046a5d716bcc1b90757345a6ce64ca08e /sound/soc/soc-jack.c | |
| parent | ASoC: Allow CODECs to flag invalid registers (diff) | |
| download | linux-dev-b8e22c1fe375a8c3b3e4fd7c569cb8932607bef3.tar.xz linux-dev-b8e22c1fe375a8c3b3e4fd7c569cb8932607bef3.zip | |
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>
Diffstat (limited to 'sound/soc/soc-jack.c')
| -rw-r--r-- | sound/soc/soc-jack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index 4aa7d8f8ce77..1d455ab79490 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -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]); } |