From patchwork Fri Feb 21 07:41:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 230688 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 CDF7FC35640 for ; Fri, 21 Feb 2020 08:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AA9E206DB for ; Fri, 21 Feb 2020 08:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582274444; bh=gL1QEeR6PJrwA5ExvA/MU2u2t/8kiN9G1g+z+gyqnTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YMIQQwpA/TqokvGA0BbVp8Rboy2a9711bfeyTTeWirjbtMo1NVW8Gk+sLbzlyS3/t +KADIry8Ro0XmvecZGLIcdZ6Vqfs4YDbljCsY2s2G0LdjjULlK9a3f+EDMW5cwG7mL PAiKL5SKlAnillzGUxgBAKh3YYXRv7gn3ilWml5E= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730483AbgBUH6i (ORCPT ); Fri, 21 Feb 2020 02:58:38 -0500 Received: from mail.kernel.org ([198.145.29.99]:58420 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729326AbgBUH6g (ORCPT ); Fri, 21 Feb 2020 02:58:36 -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 EBB05206ED; Fri, 21 Feb 2020 07:58:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582271915; bh=gL1QEeR6PJrwA5ExvA/MU2u2t/8kiN9G1g+z+gyqnTA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qvc3ywQjgHZmJ3ki5+p2EijUUe8gHsasXAyU/m6GTZEXJVhSH6MUOpEmcm5orE3KO 0rMaX1FwbrKDi37gKO/exooarA2UAEkyU3K8GM5JqVEvKuqMStNLY/Ybpq8l4kD6Ns NFsYSVMNxHMX0GsDe7cbhGkTkdNTjOLAx5fur6Dg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicola Lunghi , Takashi Iwai , Sasha Levin Subject: [PATCH 5.5 345/399] ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 Date: Fri, 21 Feb 2020 08:41:10 +0100 Message-Id: <20200221072434.305802013@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 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicola Lunghi [ Upstream commit b81cbf7abfc94878a3c6f0789f2185ee55b1cc21 ] With firmware 2.82 Line6 changed the usb id of some of the Helix devices but the quirks is still needed. Add it to the quirk list for line6 helix family of devices. Thanks to Jens for pointing out the missing ids. Signed-off-by: Nicola Lunghi Link: https://lore.kernel.org/r/20200125150917.5040-1-nick83ola@gmail.com Signed-off-by: Takashi Iwai Signed-off-by: Sasha Levin --- sound/usb/format.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sound/usb/format.c b/sound/usb/format.c index 25668ba5e68e3..f4f0cf3deaf0c 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c @@ -296,6 +296,9 @@ static int line6_parse_audio_format_rates_quirk(struct snd_usb_audio *chip, case USB_ID(0x0E41, 0x4242): /* Line6 Helix Rack */ case USB_ID(0x0E41, 0x4244): /* Line6 Helix LT */ case USB_ID(0x0E41, 0x4246): /* Line6 HX-Stomp */ + case USB_ID(0x0E41, 0x4248): /* Line6 Helix >= fw 2.82 */ + case USB_ID(0x0E41, 0x4249): /* Line6 Helix Rack >= fw 2.82 */ + case USB_ID(0x0E41, 0x424a): /* Line6 Helix LT >= fw 2.82 */ /* supported rates: 48Khz */ kfree(fp->rate_table); fp->rate_table = kmalloc(sizeof(int), GFP_KERNEL);