]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
ALSA: es1688: Add the missed snd_card_free()
authorChuhong Yuan <hslester96@gmail.com>
Wed, 3 Jun 2020 09:24:59 +0000 (17:24 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Jun 2020 08:25:00 +0000 (10:25 +0200)
commit d9b8fbf15d05350b36081eddafcf7b15aa1add50 upstream.

snd_es968_pnp_detect() misses a snd_card_free() in a failed path.
Add the missed function call to fix it.

Fixes: a20971b201ac ("ALSA: Merge es1688 and es968 drivers")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200603092459.1424093-1-hslester96@gmail.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
sound/isa/es1688/es1688.c

index a826c138e7f555ec3a0e3345265f646bc3ff135e..8a58ed1687562d3aa9ceb5292184f3ed81ce8dde 100644 (file)
@@ -284,8 +284,10 @@ static int snd_es968_pnp_detect(struct pnp_card_link *pcard,
                return error;
        }
        error = snd_es1688_probe(card, dev);
-       if (error < 0)
+       if (error < 0) {
+               snd_card_free(card);
                return error;
+       }
        pnp_set_card_drvdata(pcard, card);
        snd_es968_pnp_is_probed = 1;
        return 0;