Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / sound / soc / codecs / ab8500-codec.c

diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c
index 95dc7d5bb07677ca732a4465475675594f0a6247..3c795921c5f6b840f6654d53907ed44e18435841 100644 (file)
--- a/sound/soc/codecs/ab8500-codec.c
+++ b/sound/soc/codecs/ab8500-codec.c
@@ -1235,7 +1235,8 @@ static int anc_status_control_put(struct snd_kcontrol *kcontrol,
                req != ANC_APPLY_IIR) {
                dev_err(dev, "%s: ERROR: Unsupported status to set '%s'!\n",
                        __func__, enum_anc_state[req]);
-               return -EINVAL;
+               status = -EINVAL;
+               goto cleanup;
        }
        apply_fir = req == ANC_APPLY_FIR || req == ANC_APPLY_FIR_IIR;
        apply_iir = req == ANC_APPLY_IIR || req == ANC_APPLY_FIR_IIR;
@@ -2518,4 +2519,4 @@ static struct platform_driver ab8500_codec_platform_driver = {
 };
 module_platform_driver(ab8500_codec_platform_driver);
 
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");