android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path

Browse Source 
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin
2011-09-23 13:23:10 +08:00
committed by Mark Brown
parent 0010bcc226
commit 0a742681e6
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2493,6 +2493,8 @@ static int wm5100_probe(struct snd_soc_codec *codec)
return 0; return 0;
err_gpio: err_gpio:
if (i2c->irq)
free_irq(i2c->irq, codec);
wm5100_free_gpio(codec); wm5100_free_gpio(codec);
err_reset: err_reset:
if (wm5100->pdata.reset) { if (wm5100->pdata.reset) {
@ -2523,11 +2525,14 @@ err_core:
static int wm5100_remove(struct snd_soc_codec *codec) static int wm5100_remove(struct snd_soc_codec *codec)
{ {
struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec); struct wm5100_priv *wm5100 = snd_soc_codec_get_drvdata(codec);
struct i2c_client *i2c = to_i2c_client(codec->dev);
wm5100_set_bias_level(codec, SND_SOC_BIAS_OFF); wm5100_set_bias_level(codec, SND_SOC_BIAS_OFF);
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, codec);
wm5100_free_gpio(codec); wm5100_free_gpio(codec);
if (wm5100->pdata.reset) { if (wm5100->pdata.reset) {
gpio_set_value_cansleep(wm5100->pdata.reset, 1); gpio_set_value_cansleep(wm5100->pdata.reset, 1);