浏览代码

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>
Lars-Peter Clausen 16 年之前
父节点
当前提交
b8e22c1fe3
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      sound/soc/soc-jack.c

+ 3 - 3
sound/soc/soc-jack.c

@@ -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]);
 	}
 	}