diff options
author | Jesper Juhl <jj@chaosbits.net> | 2012-04-09 22:52:19 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-10 11:07:58 +0100 |
commit | 34ff0f95b1d7afc707f121ea3ae6b211fc176fbd (patch) | |
tree | 5cb13b8edb636f44ccf77b9badf2e5fc01b909d7 /sound | |
parent | bbdd39155682e444941cc70f991154f2936a522b (diff) | |
download | linux-stable-34ff0f95b1d7afc707f121ea3ae6b211fc176fbd.tar.gz linux-stable-34ff0f95b1d7afc707f121ea3ae6b211fc176fbd.tar.bz2 linux-stable-34ff0f95b1d7afc707f121ea3ae6b211fc176fbd.zip |
ASoC: wm8994: Don't test for NULL before release_firmware()
release_firmware() does its own NULL ptr testing, it's redundant to
also test before calling it.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/codecs/wm8994.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 44f72dc27711..8b05e78b11c9 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -3936,7 +3936,7 @@ err_irq: return ret; } -static int wm8994_codec_remove(struct snd_soc_codec *codec) +static int wm8994_codec_remove(struct snd_soc_codec *codec) { struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994 *control = wm8994->wm8994; @@ -3977,14 +3977,10 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec) free_irq(wm8994->micdet_irq, wm8994); break; } - if (wm8994->mbc) - release_firmware(wm8994->mbc); - if (wm8994->mbc_vss) - release_firmware(wm8994->mbc_vss); - if (wm8994->enh_eq) - release_firmware(wm8994->enh_eq); + release_firmware(wm8994->mbc); + release_firmware(wm8994->mbc_vss); + release_firmware(wm8994->enh_eq); kfree(wm8994->retune_mobile_texts); - return 0; } |