Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9650d5a1 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

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: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20211003132255.31743-1-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Stable-dep-of: 39db65a0a17b ("ASoC: es8316: Handle optional IRQ assignment")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f5ce428e

sound/soc/codecs/es8316.c

+2 −5
Original line number Diff line number Diff line
@@ -807,12 +807,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;

	}