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

Commit e8770dd8 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: wm5100: Fix mismerge of IRQ frees 



We only want them at the device level, not at the CODEC level.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 05d448e2

sound/soc/codecs/wm5100.c

+0 −4
Original line number Diff line number Diff line
@@ -2525,8 +2525,6 @@ static int wm5100_probe(struct snd_soc_codec *codec) 
	return 0;



err_gpio:

	if (i2c->irq)

		free_irq(i2c->irq, wm5100);



	return ret;

}
@@ -2539,8 +2537,6 @@ static int wm5100_remove(struct snd_soc_codec *codec) 
	if (wm5100->pdata.hp_pol) {

		gpio_free(wm5100->pdata.hp_pol);

	}

	if (i2c->irq)

		free_irq(i2c->irq, wm5100);



	return 0;

}