ASoC: rt5651: Use IRQF_NO_AUTOEN when requesting the IRQ

[ Upstream commit 6e037b72cf4ea6c28a131ea021d63ee4e7e6fa64 ]

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-2-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/rt5651.c b/sound/soc/codecs/rt5651.c
index fc0c83b73f099e60a53d3e710623ed85791b44d0..93820561b9f5ded7c35b1a2dfe02aaa50d540c1e 100644 (file)
--- a/sound/soc/codecs/rt5651.c
+++ b/sound/soc/codecs/rt5651.c
@@ -2261,11 +2261,8 @@ static int rt5651_i2c_probe(struct i2c_client *i2c,
 
        ret = devm_request_irq(&i2c->dev, rt5651->irq, rt5651_irq,
                               IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
-                              | IRQF_ONESHOT, "rt5651", rt5651);
-       if (ret == 0) {
-               /* Gets re-enabled by rt5651_set_jack() */
-               disable_irq(rt5651->irq);
-       } else {
+                              | IRQF_ONESHOT | IRQF_NO_AUTOEN, "rt5651", rt5651);
+       if (ret) {
                dev_warn(&i2c->dev, "Failed to reguest IRQ %d: %d\n",
                         rt5651->irq, ret);
                rt5651->irq = -ENXIO;