* [alsa-devel] [PATCH] ALSA: usb-audio: unlock on error in probe
@ 2020-01-15 17:46 Dan Carpenter
2020-01-15 19:26 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2020-01-15 17:46 UTC (permalink / raw)
To: Jaroslav Kysela, Alexander Tsoy
Cc: alsa-devel, Takashi Iwai, Greg Kroah-Hartman, kernel-janitors,
Richard Fontana, Shuah Khan
We need to unlock before we returning on this error path.
Fixes: 73ac9f5e5b43 ("ALSA: usb-audio: Add boot quirk for MOTU M Series")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
sound/usb/card.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 2f582ac7cf78..827fb0bc8b56 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -602,7 +602,7 @@ static int usb_audio_probe(struct usb_interface *intf,
if (! chip) {
err = snd_usb_apply_boot_quirk_once(dev, intf, quirk, id);
if (err < 0)
- return err;
+ goto __error;
/* it's a fresh one.
* now look for an empty slot and create a new card instance
--
2.11.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [alsa-devel] [PATCH] ALSA: usb-audio: unlock on error in probe
2020-01-15 17:46 [alsa-devel] [PATCH] ALSA: usb-audio: unlock on error in probe Dan Carpenter
@ 2020-01-15 19:26 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2020-01-15 19:26 UTC (permalink / raw)
To: Dan Carpenter
Cc: alsa-devel, Greg Kroah-Hartman, kernel-janitors, Richard Fontana,
Alexander Tsoy, Shuah Khan
On Wed, 15 Jan 2020 18:46:04 +0100,
Dan Carpenter wrote:
>
> We need to unlock before we returning on this error path.
>
> Fixes: 73ac9f5e5b43 ("ALSA: usb-audio: Add boot quirk for MOTU M Series")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thanks, applied.
Takashi
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-15 19:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-15 17:46 [alsa-devel] [PATCH] ALSA: usb-audio: unlock on error in probe Dan Carpenter
2020-01-15 19:26 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).