From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93B1BC35641 for ; Fri, 21 Feb 2020 07:55:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6A50420578 for ; Fri, 21 Feb 2020 07:55:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271719; bh=1rEREmuUihtXcVVSX2bzp7bwvtbz9D5X+fmfAb9h+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jbLd9wFJlCq9I2TRE8NoCjoBEHpmYugmdsW0FR3IkfJRqJpAAkCx0CaKKaMDlK8mN +wLUiNNGqQzr7jz+97yDbM/E+A/gmGxxPDCm4sKdZnal6+1G8r+qHpTUudB45DfTet gStVnSY1iXSLLMDG/NczTt/28sr6B0p5m0bDzrrQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730204AbgBUHzO (ORCPT ); Fri, 21 Feb 2020 02:55:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:53996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729831AbgBUHzL (ORCPT ); Fri, 21 Feb 2020 02:55:11 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A2D624650; Fri, 21 Feb 2020 07:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271710; bh=1rEREmuUihtXcVVSX2bzp7bwvtbz9D5X+fmfAb9h+MU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WpHUzBtNksYzKwWKOyC3XO4bt0G4x4fX1COiXUJFmU9nMVwAz3XrfSlpXjyyoleaq mAKzTwuqtiM0dLmFZpcFlFy6GymXqp3ulG9bwbkOrk54o8JR6mbkTicBC50X4xyCXD r8wKZdXeH95z3limPXiNJ/5wIE6WPIt0NHYFaCcI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Takashi Iwai , Sasha Levin Subject: [PATCH 5.5 268/399] ALSA: usb-audio: unlock on error in probe Date: Fri, 21 Feb 2020 08:39:53 +0100 Message-Id: <20200221072428.322011316@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072402.315346745@linuxfoundation.org> References: <20200221072402.315346745@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ 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 Link: https://lore.kernel.org/r/20200115174604.rhanfgy4j3uc65cx@kili.mountain Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- 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