Skip to content

Commit

Permalink
ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path
Browse files Browse the repository at this point in the history
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
  • Loading branch information
Axel Lin authored and Mark Brown committed Sep 23, 2011
1 parent 0010bcc commit 0a74268
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions sound/soc/codecs/wm5100.c
Original file line number Diff line number Diff line change
Expand Up @@ -2493,6 +2493,8 @@ static int wm5100_probe(struct snd_soc_codec *codec)
return 0;

err_gpio:
if (i2c->irq)
free_irq(i2c->irq, codec);
wm5100_free_gpio(codec);
err_reset:
if (wm5100->pdata.reset) {
Expand Down Expand Up @@ -2523,11 +2525,14 @@ static int wm5100_probe(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 i2c_client *i2c = to_i2c_client(codec->dev);

wm5100_set_bias_level(codec, SND_SOC_BIAS_OFF);
if (wm5100->pdata.hp_pol) {
gpio_free(wm5100->pdata.hp_pol);
}
if (i2c->irq)
free_irq(i2c->irq, codec);
wm5100_free_gpio(codec);
if (wm5100->pdata.reset) {
gpio_set_value_cansleep(wm5100->pdata.reset, 1);
Expand Down

0 comments on commit 0a74268

Please sign in to comment.