summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorChuhong Yuan <hslester96@gmail.com>2020-06-03 17:24:59 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-06-20 10:25:00 +0200
commit7fb076a06349b08671fa0f4c1ef86b77ff952da1 (patch)
treef7b387577b15bc88b1ec755f5b426d1ce40fffb2 /sound
parent5523bc9ca5fc051847b28dffa2e21aa9fb8d34c6 (diff)
ALSA: es1688: Add the missed snd_card_free()
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/isa/es1688/es1688.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index a826c138e7f5..8a58ed168756 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -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;