UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: wm5100: Fix mismerge of IRQ frees 

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

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2012-01-24 12:11:20 +00:00
parent 05d448e2c9
commit e8770dd878
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/wm5100.c
View File

@ -2525,8 +2525,6 @@ static int wm5100_probe(struct snd_soc_codec *codec)
return 0; return 0;
err_gpio: err_gpio:
if (i2c->irq)
free_irq(i2c->irq, wm5100);
return ret; return ret;
} }
@ -2539,8 +2537,6 @@ static int wm5100_remove(struct snd_soc_codec *codec)
if (wm5100->pdata.hp_pol) { if (wm5100->pdata.hp_pol) {
gpio_free(wm5100->pdata.hp_pol); gpio_free(wm5100->pdata.hp_pol);
} }
if (i2c->irq)
free_irq(i2c->irq, wm5100);
return 0; return 0;
} }