Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp275881pxb; Thu, 25 Feb 2021 02:06:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJyaONUMOtJzoQZ+6Tp66AlwePMoT+EJ2FxfGSHzoTV8qbt1hLkHfa2B+xD1sb2PofyV6ANh X-Received: by 2002:aa7:d1cd:: with SMTP id g13mr983952edp.369.1614247586950; Thu, 25 Feb 2021 02:06:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614247586; cv=none; d=google.com; s=arc-20160816; b=RrJioEPuc2PWrv6xRKCdamAym1Iu5/QBP3Zpb1PaxEnRZAnQBadR4AJ7Uw0QR2efJF WWm9pcR6C1Tor09pcL5k9ehFY3SYbAMeOsSBK9+WSgNf2qALbn8Jlj2ozi+7W8CHc3Pq SRIY2ZDOnqEnnsuzel2qDEUCxrhRR+3QAvDov2nUokjouGwi/BYHvW8bks39H+JZc0IK oL4AYzgce9tcPElqZvPb4BaSOQPNyHG6CBKJj6oSQjCWFLqXdfE40ZwkhVkvqoY3LsEX RrFjlW6DX5AyiIsOnG2+ISJGbi2bMnohtYWRmImdxcAveQZnQpNO+oRo4v4dN8/AcuXo k6pg== 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=u7QYBikC1Xy8wgWXxkfzWOVTo5dqAO0/JLABokDu8tY=; b=Sf2cUUHE74citU//Nk8LP+1YjywnS0yKur1iXxjQZ/O+MxX+FuckD645ylQN8REB/y 5D7Xj4WgXAmyjCY1ooqrQZLXQ4vJWDXd1wn2kcavEgV4u0PZrqYOOov0Y4Fb/jCL9zHJ B89mX16RTv0iRD50Bxpx++yK57BNrZXDVPCxpDoR3PIIpj8ahIPjK9JDjXo6YYLNakhJ lDygiaMkeGinfXhS2w4EvITqgogYRqApuCmibM8WePIms/KmpVZHpBrxJ5W5CnwdclGG zAHCSN/3HpcRzEA4OIFAWH61RLjlsOAL6i2+XwCC35Pn3AWpu+/PmzCugYBkb+QzAFqa J0Eg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=aZ4qqPVQ; 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 j19si3124598edw.355.2021.02.25.02.06.04; Thu, 25 Feb 2021 02:06:26 -0800 (PST) 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=aZ4qqPVQ; 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 S234385AbhBYJ6L (ORCPT + 99 others); Thu, 25 Feb 2021 04:58:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:33384 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235279AbhBYJzr (ORCPT ); Thu, 25 Feb 2021 04:55:47 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 71C4D64EFA; Thu, 25 Feb 2021 09:54:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614246849; bh=BViO87cLdkLb4nnIj22hLyjnw+zpQKuNU92oSogE66s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aZ4qqPVQjpFLIrKw0tELFCBgmdSSDxxvgsFrHeI8uL3dkajeFxaBKr7wC/2j65Ayi tAiZbyNbxq0KJKA/kRa0EXDI0Q8+4ELV1sf3Bjbr/R3mHYYW7BXU+uK8GGp4S743az dhRgbLt3h+aGUc8KoXR474sh9bDLGHz6V3jVEfm4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johan Hovold Subject: [PATCH 5.11 03/12] USB: quirks: sort quirk entries Date: Thu, 25 Feb 2021 10:53:37 +0100 Message-Id: <20210225092515.182454523@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210225092515.015261674@linuxfoundation.org> References: <20210225092515.015261674@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: Johan Hovold commit 43861d29c0810a70792bf69d37482efb7bb6677d upstream. Move the last entry to its proper place to maintain the VID/PID sort order. Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20210210111746.13360-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/quirks.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -415,6 +415,9 @@ static const struct usb_device_id usb_qu { USB_DEVICE(0x10d6, 0x2200), .driver_info = USB_QUIRK_STRING_FETCH_255 }, + /* novation SoundControl XL */ + { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME }, + /* Huawei 4G LTE module */ { USB_DEVICE(0x12d1, 0x15bb), .driver_info = USB_QUIRK_DISCONNECT_SUSPEND }, @@ -495,9 +498,6 @@ static const struct usb_device_id usb_qu /* INTEL VALUE SSD */ { USB_DEVICE(0x8086, 0xf1a5), .driver_info = USB_QUIRK_RESET_RESUME }, - /* novation SoundControl XL */ - { USB_DEVICE(0x1235, 0x0061), .driver_info = USB_QUIRK_RESET_RESUME }, - { } /* terminating entry must be last */ };