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

   1 commit 5ced436d549d911ce610ea47d85f71fae5bbfce4
   2 Author: Lars-Peter Clausen <lars@metafoo.de>
   3 Date:   Fri Jul 31 18:26:48 2009 +0200
   4
   5     ASoC: jack: Fix race in snd_soc_jack_add_gpios
   6
   7     The irq can fire as soon as it has been requested, thus all fields accessed
   8     from within the irq handler must be initialized prior to requesting the irq.
   9
  10     Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
  11
  12 diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c
  13 index 28346fb..639333a 100644
  14 --- a/sound/soc/soc-jack.c
  15 +++ b/sound/soc/soc-jack.c
  16 @@ -220,6 +220,9 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
  17                 if (ret)
  18                         goto err;
  19
  20 +               INIT_WORK(&gpios[i].work, gpio_work);
  21 +               gpios[i].jack = jack;
  22 +
  23                 ret = request_irq(gpio_to_irq(gpios[i].gpio),
  24                                 gpio_handler,
  25                                 IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
  26 @@ -227,9 +230,6 @@ int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
  27                                 &gpios[i]);
  28                 if (ret)
  29                         goto err;
  30 -
  31 -               INIT_WORK(&gpios[i].work, gpio_work);
  32 -               gpios[i].jack = jack;
  33         }
  34
  35         return 0;