2020-06-03 09:29:19

by Chuhong Yuan

Subject: [PATCH] ALSA: es1688: Add the missed snd_card_free()

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 <[email protected]>
---
sound/isa/es1688/es1688.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index ff3a05ad99c0..64610571a5e1 100644
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -267,8 +267,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;
--
2.26.2

2020-06-03 09:44:13

by Takashi Iwai

Subject: Re: [PATCH] ALSA: es1688: Add the missed snd_card_free()

On Wed, 03 Jun 2020 11:24:59 +0200,
Chuhong Yuan wrote:
>
> 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 <[email protected]>

Thanks, applied now with Cc-to-stable.


Takashi