ASoC: es8316: Use IRQF_NO_AUTOEN when requesting the IRQ

[ Upstream commit 1cf2aa665901054b140eb71748661ceae99b6b5a ]

Use the new IRQF_NO_AUTOEN flag when requesting the IRQ, rather then
disabling it immediately after requesting it.

This fixes a possible race where the IRQ might trigger between requesting
and disabling it; and this also leads to a small code cleanup.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211003132255.31743-1-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 067757d1d70a3bfb39b5083b12e7a5159fe8e1a8..5fb02635c140600b8ba7a42718ee1143d2c9d819 100644 (file)
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -811,12 +811,9 @@ static int es8316_i2c_probe(struct i2c_client *i2c_client,
        mutex_init(&es8316->lock);
 
        ret = devm_request_threaded_irq(dev, es8316->irq, NULL, es8316_irq,
-                                       IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
+                                       IRQF_TRIGGER_HIGH | IRQF_ONESHOT | IRQF_NO_AUTOEN,
                                        "es8316", es8316);
-       if (ret == 0) {
-               /* Gets re-enabled by es8316_set_jack() */
-               disable_irq(es8316->irq);
-       } else {
+       if (ret) {
                dev_warn(dev, "Failed to get IRQ %d: %d\n", es8316->irq, ret);
                es8316->irq = -ENXIO;
        }