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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 0CE4BC33CAF for ; Thu, 16 Jan 2020 17:45:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D77E824763 for ; Thu, 16 Jan 2020 17:45:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196712; bh=IPxNaZ0XX8ovahK6BygiNUpPGfAZDm8wNz6xVQQXylo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=BGenH9n/eqLq0RVQRsUSJD7NlvbDlXH07PDpG6DTT438IuqI2uALh8R1Z1myhdTHk xWH3/ELCS9P1bkJaxat4MhKvFlE1wXQZISRIHOPZHRmsgo6COSdD1kugKrNaGRZf6D aTpn9QgENY80My0IbwS5O2uUU0LVs8h7YQAuctkE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406112AbgAPRpL (ORCPT ); Thu, 16 Jan 2020 12:45:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:35852 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405937AbgAPRoo (ORCPT ); Thu, 16 Jan 2020 12:44:44 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 53F8424775; Thu, 16 Jan 2020 17:44:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196683; bh=IPxNaZ0XX8ovahK6BygiNUpPGfAZDm8wNz6xVQQXylo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F0peCJSJOY11Hh3n095jKxPzp244Ty5p5nttPF+z/Wydjlb+daEt9XJBi/cFZxd9/ OeOENf7RlbbIB891EN4uy9QdhydiqxBsZzjeXi4HCjb8qxBUJFcB1JCEGjsXOxVNoJ p1f1WHdt0lCju66+5iWePv245Kf0Rm41jb4lXBoI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Takashi Iwai , Sasha Levin , alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 4.4 081/174] ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk() Date: Thu, 16 Jan 2020 12:41:18 -0500 Message-Id: <20200116174251.24326-81-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116174251.24326-1-sashal@kernel.org> References: <20200116174251.24326-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai [ Upstream commit 328e9f6973be2ee67862cb17bf6c0c5c5918cd72 ] The error from snd_usb_mixer_apply_create_quirk() is ignored in the current usb-audio driver code, which will continue the probing even after the error. Let's take it more serious. Fixes: 7b1eda223deb ("ALSA: usb-mixer: factor out quirks") Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/mixer.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index 1b81f18010d2..73149b9be29c 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2552,7 +2552,9 @@ int snd_usb_create_mixer(struct snd_usb_audio *chip, int ctrlif, (err = snd_usb_mixer_status_create(mixer)) < 0) goto _error; - snd_usb_mixer_apply_create_quirk(mixer); + err = snd_usb_mixer_apply_create_quirk(mixer); + if (err < 0) + goto _error; err = snd_device_new(chip->card, SNDRV_DEV_CODEC, mixer, &dev_ops); if (err < 0) -- 2.20.1