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

Commit 7ea3470a authored by Nicolas Boichat's avatar Nicolas Boichat Committed by Mark Brown
Browse files

ASoC: rt5645: Init jack_detect_work before registering irq 



Prevents frequent panic on boot, if the irq handler rt5645_irq
gets called before the workqueue rt5645_jack_detect_work is
initialized.

Signed-off-by: default avatarNicolas Boichat <drinkcat@chromium.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
parent 692768c4

sound/soc/codecs/rt5645.c

+2 −2
Original line number Diff line number Diff line
@@ -2837,6 +2837,8 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
		}

	}



	INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work);



	if (rt5645->i2c->irq) {

		ret = request_threaded_irq(rt5645->i2c->irq, NULL, rt5645_irq,

			IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING
@@ -2855,8 +2857,6 @@ static int rt5645_i2c_probe(struct i2c_client *i2c, 
			dev_err(&i2c->dev, "Fail gpio_direction hp_det_gpio\n");

	}



	INIT_DELAYED_WORK(&rt5645->jack_detect_work, rt5645_jack_detect_work);



	return snd_soc_register_codec(&i2c->dev, &soc_codec_dev_rt5645,

				      rt5645_dai, ARRAY_SIZE(rt5645_dai));

}