Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3519478pxf; Mon, 15 Mar 2021 11:21:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4Rq/mkO4c+++lsbhf2z7r3R1Yf3eL+rtI7V6+geKcNEGLnva7Ly3LirEdsHG3pBn5F08y X-Received: by 2002:aa7:c403:: with SMTP id j3mr31496689edq.137.1615832489203; Mon, 15 Mar 2021 11:21:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832489; cv=none; d=google.com; s=arc-20160816; b=aLRNawuSnHliRYgQ0X6ig5MSMl1nl+ygKYOTK4mRYiK50/gW3XwoggRfIIHpZnz3DC Bve2AhY2JNnbwgHPNVUEVk+B828z+KL3YhNQRObPhppwfGU2FAJ8Qwb2Bmq5iZOxBQGN E4CxlIT+fCnnLzGWpCVenH576S1eO9NNOTWDy01z+qurB+LG9histPhhk8d02NOumdp9 +iYi4upfDGrK6qX65rO0esDwj+zs/cSWmd8SZKI4icK14OmilqLKTnQETN0qbxngfdOm l0lcH+C+NpVLV276IsgQOC+dfek/Rq1/OdRuGNnhs1bhexuIjDpDnz53Q+C8vyRqp+Sv Ndig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=/smTzr4sj3lRGRiHHeTNW+5z20J4P282BY4xAp/jIno=; b=a33JdKp1WtGAg0SIvt3vwMzYOOahYtfv665ERrQ4DqofjlkPG9/jXCUQpx03jXpsal DhXDam+6/LaVJLcOXpSSpN3oJ6Dhe0QpTKZ5MHVog2TnwBOHqHg5S6IkbSBYeyx+6hJE UBczWgliCtTVHTM/MYoM3BAPkAGT+ZSlWHUOgqTx4EDuDSH85czkDryI9KL8LBGiX3ba 87D3BW2I9zq15tVNFBLBIbi+bsQw8nKRi92zFsGWK/NUTLmiHFqQfVlXy2epCPzPX67v orlap0AXlmidRKWQ65D746VS86L1LF0eeDma6a2GkjmnllWzxMVWWTc++mtDcYiqOVtL u6+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WnUYN7Q/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m7si12063132edd.486.2021.03.15.11.21.06; Mon, 15 Mar 2021 11:21:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="WnUYN7Q/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237523AbhCOOSV (ORCPT + 99 others); Mon, 15 Mar 2021 10:18:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:37500 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232760AbhCON7l (ORCPT ); Mon, 15 Mar 2021 09:59:41 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 77C2864F87; Mon, 15 Mar 2021 13:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816766; bh=aub/wW0L/r+PGDezeTTgN6pqKalUmmN9zQjC8nJQYcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WnUYN7Q/s3SVSjoqUpJEHNa36QvNZ3gEMogx7vJdGw8TTv1IaGl3UUQcHzFKeFlzn cYKCa0cwatYRwyuIFsDP3TJsLt5R3Tnjis/QzFbP14Bhpb8dBgzwQTDuDZaps+pkX9 TU5ElnaaP2yCLqHhAaexLLgWPpGx7jwlfLlDiKEc= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.4 095/168] ALSA: usb-audio: Apply the control quirk to Plantronics headsets Date: Mon, 15 Mar 2021 14:55:27 +0100 Message-Id: <20210315135553.496783438@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135550.333963635@linuxfoundation.org> References: <20210315135550.333963635@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Takashi Iwai commit 06abcb18b3a021ba1a3f2020cbefb3ed04e59e72 upstream. Other Plantronics headset models seem requiring the same workaround as C320-M to add the 20ms delay for the control messages, too. Apply the workaround generically for devices with the vendor ID 0x047f. Note that the problem didn't surface before 5.11 just with luck. Since 5.11 got a big code rewrite about the stream handling, the parameter setup procedure has changed, and this seemed triggering the problem more often. BugLink: https://bugzilla.suse.com/show_bug.cgi?id=1182552 Cc: Link: https://lore.kernel.org/r/20210304085009.4770-1-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/quirks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -1606,10 +1606,10 @@ void snd_usb_ctl_msg_quirk(struct usb_de msleep(20); /* - * Plantronics C320-M needs a delay to avoid random - * microhpone failures. + * Plantronics headsets (C320, C320-M, etc) need a delay to avoid + * random microhpone failures. */ - if (chip->usb_id == USB_ID(0x047f, 0xc025) && + if (USB_ID_VENDOR(chip->usb_id) == 0x047f && (requesttype & USB_TYPE_MASK) == USB_TYPE_CLASS) msleep(20);