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=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 57F09C43381 for ; Mon, 18 Feb 2019 14:44:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1CD6721736 for ; Mon, 18 Feb 2019 14:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550501072; bh=dGn3K5fzq+SrGiM2ltOCvdBm0TKHiLFy1kvstNevzfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sBCheU6wO95fChrFfZEDYmxlGrElTBRdHNl82IIqTHxoFcLEmXmJi5iFVa91vzphH G9i56NZZWnOpGR4cSzZIYKb48ytBLCOBiWdMhgxNTx+9zApMkTSEUChrL9LDLipgGg 70wW/FR6cMkC9g3mk/dYusna5B3YmT9IHCt1jttU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729925AbfBRNsS (ORCPT ); Mon, 18 Feb 2019 08:48:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:55062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731192AbfBRNsP (ORCPT ); Mon, 18 Feb 2019 08:48:15 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 98CF621905; Mon, 18 Feb 2019 13:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550497695; bh=dGn3K5fzq+SrGiM2ltOCvdBm0TKHiLFy1kvstNevzfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cRQvKfylE0bjsnf8RYmxzzbNdLO8dgL8xy1DVnLRdK7WESCvVUdMNKA98o4QQOkDE 64usQ6ZlVFt6IZ97qSUDNBLekZrTLtnTxc9/hsTk3N0xaBlLzDDJmAOskgpX1wNi9h 6mJw0KEXqO35JoP0xMX44nxkH89zsMAQeNWNvlC0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Manuel Reinhardt , Takashi Iwai Subject: [PATCH 4.20 57/92] ALSA: usb-audio: Fix implicit fb endpoint setup by quirk Date: Mon, 18 Feb 2019 14:43:00 +0100 Message-Id: <20190218133500.180598629@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133454.668268457@linuxfoundation.org> References: <20190218133454.668268457@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Manuel Reinhardt commit 2bc16b9f3223d049b57202ee702fcb5b9b507019 upstream. The commit a60945fd08e4 ("ALSA: usb-audio: move implicit fb quirks to separate function") introduced an error in the handling of quirks for implicit feedback endpoints. This commit fixes this. If a quirk successfully sets up an implicit feedback endpoint, usb-audio no longer tries to find the implicit fb endpoint itself. Fixes: a60945fd08e4 ("ALSA: usb-audio: move implicit fb quirks to separate function") Signed-off-by: Manuel Reinhardt Cc: Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/pcm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -314,6 +314,9 @@ static int search_roland_implicit_fb(str return 0; } +/* Setup an implicit feedback endpoint from a quirk. Returns 0 if no quirk + * applies. Returns 1 if a quirk was found. + */ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, struct usb_device *dev, struct usb_interface_descriptor *altsd, @@ -384,7 +387,7 @@ add_sync_ep: subs->data_endpoint->sync_master = subs->sync_endpoint; - return 0; + return 1; } static int set_sync_endpoint(struct snd_usb_substream *subs, @@ -423,6 +426,10 @@ static int set_sync_endpoint(struct snd_ if (err < 0) return err; + /* endpoint set by quirk */ + if (err > 0) + return 0; + if (altsd->bNumEndpoints < 2) return 0;