Skip to content

Commit

Permalink
ASoC: rt5651: Use IRQF_NO_AUTOEN when requesting the IRQ
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hans de Goede authored and Mark Brown committed Oct 4, 2021
1 parent 1cf2aa6 commit 6e037b7
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions sound/soc/codecs/rt5651.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6e037b7

Please sign in to comment.