From patchwork Fri Jan 24 09:29:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 233194 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,USER_AGENT_GIT autolearn=ham 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 ADB51C2D0DB for ; Fri, 24 Jan 2020 09:55:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 851B320709 for ; Fri, 24 Jan 2020 09:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859709; bh=V7+Srg/uvT5GfV1Jok2oMuGAHtGGv5gftaXZtvvOl0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=APqqecQa8z9iQrpHkAEKj05b7crmogDN2SPWOhn42iC7i0kuYnzfZTFoSuiGNFolu GBG4w8MP02EBSHHh1crSJHDEPw/QAdxj5sKq5JT2PmKqBDLiSM+gIKXOSbKNkcirW3 wtrDf1RtbhS9bpYIqhWEj0Qo1oDdS6BX+2bojNkc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388420AbgAXJzI (ORCPT ); Fri, 24 Jan 2020 04:55:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:58320 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387997AbgAXJzI (ORCPT ); Fri, 24 Jan 2020 04:55:08 -0500 Received: from localhost (unknown [145.15.244.15]) (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 220BF206D5; Fri, 24 Jan 2020 09:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579859707; bh=V7+Srg/uvT5GfV1Jok2oMuGAHtGGv5gftaXZtvvOl0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i23BeELO/B0Vtx8jehuKQj1lffptmYf9oCwOVIN4HQdolVNsB0q6Lt8dHW5/Wpm91 uKAhCVRQFs6ehAOAyiqGMgPHga+2BZ32cGgonlOSrVFx3hthyuHsTSvfpFcZw6gelF HbsqSfRp8laDHLJHhRteoJ7bHknmMTcEdlLfouMU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai , Sasha Levin Subject: [PATCH 4.14 177/343] ALSA: usb-audio: Handle the error from snd_usb_mixer_apply_create_quirk() Date: Fri, 24 Jan 2020 10:29:55 +0100 Message-Id: <20200124092943.293425026@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124092919.490687572@linuxfoundation.org> References: <20200124092919.490687572@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 044193b2364d0..e6e4c3b9d9d3f 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2632,7 +2632,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)