lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 371/542] ALSA: usb-audio: unlock on error in probe
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    [ Upstream commit a3afa29942b84b4e2548beacccc3a68b8d77e3dc ]

    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>
    Link: https://lore.kernel.org/r/20200115174604.rhanfgy4j3uc65cx@kili.mountain
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 2f582ac7cf789..827fb0bc8b561 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.20.1
    \
     
     \ /
      Last update: 2020-02-14 18:58    [W:3.519 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site