ASoC: Add missed free_irq in wm5100_remove and wm5100_probe error path
authorAxel Lin <axel.lin@gmail.com>
Fri, 23 Sep 2011 05:23:10 +0000 (13:23 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 23 Sep 2011 10:54:24 +0000 (11:54 +0100)
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/wm5100.c

index cb940a8b39141d60d155ada1bf3b7f615ad71d12..f6039890edfd0e1a28bf0c3e2fc0bfba8b739414 100644 (file)
@@ -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) {
@@ -2523,11 +2525,14 @@ err_core:
 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);