From patchwork Tue Dec 1 08:53:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 335113 Delivered-To: patch@linaro.org Received: by 2002:a92:5e16:0:0:0:0:0 with SMTP id s22csp5489306ilb; Tue, 1 Dec 2020 01:07:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJzh3U1MIW8i/M9kRVGqB5WBtDFuiCyiu2Rz0Wp0g5SsFbT1nA0e8RZSviPAROioT6RfJF+m X-Received: by 2002:a17:906:1945:: with SMTP id b5mr2148163eje.388.1606813630526; Tue, 01 Dec 2020 01:07:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606813630; cv=none; d=google.com; s=arc-20160816; b=jsaU7InQxnNVuK47nDmfCXgrQg7y869Lk//wZT2Gst26/QVDNAZ//kmqFm3x7XsIBJ pvwqn60GqzQu+KLN65JImBKdMdRCmRvSvKp6bVmykgavUPwobxPP1mFLuAZx618poN0v uzPyX5j8yGdzbCap5QUe8Fy9JRgh7iEEcSerPQ7kwA1mCTigR0Qrbbv1LfKQkuTFie8z M8XZdOiLd4L9SdQUmUL66OYb91SsO6F36MkqVHkzFGqXZm1DOspGNuCU1yo0j/W3UYTQ ulAhr4S+IfQVdd2MsSlWeOyC1vebyarNL8MKe8zJ3d+lHc3ogMT9Q3ax4x2nzeKFpWK2 Ez0w== 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=2i0R22DzOFIOLw4XFL+TVnJ4GjlhyiSI0Dci972BNlc=; b=TziFSyyeOxml5+YUdEGBN9jvudH/AqR0uRjOLVLECylvA+vVtKBjzBs43iyKpU0QwR VZTouo/yU7MU2T+v1SGOnU6TIQ2YloNgk9qMBrPeGb3bThDwEvUH77ARkOMJSRhoO6ir f3rVSGlhig92F8SUQ6D8P7Phly2kh1q/qNcrhhtmktdNBNkqHQshEdS8JbcdQv0HkzBx 4uEVK7XnRvTMv9o1XKeC3ywyPSG94L9kyk4UbIsLbYtAngvDfYeIldbBn2P4UtOEKl8B 0A6DLDLiGDIkd7ZBAUhYLxaL5PYdXdO/3MP7ful7YjqMUtoT5jupu0G0cQY2CVXog68i v84A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pvu8jlxB; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 r19si539139ejc.668.2020.12.01.01.07.10; Tue, 01 Dec 2020 01:07:10 -0800 (PST) Received-SPF: pass (google.com: domain of stable-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=Pvu8jlxB; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-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 S2388234AbgLAJFz (ORCPT + 14 others); Tue, 1 Dec 2020 04:05:55 -0500 Received: from mail.kernel.org ([198.145.29.99]:41922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389058AbgLAJFK (ORCPT ); Tue, 1 Dec 2020 04:05:10 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (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 18E9B21D7A; Tue, 1 Dec 2020 09:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1606813494; bh=kJKwS4GsTZmni+0jTLCZD40IeNVZuyZ27b/reR4p9AQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pvu8jlxBCmMUczyCehQpsVKSCa7TQQuBJq7YEnRRC65uwEPL3IHo/JWTx1GTXPwLG q7+z3gc4q74EYPDR7bAq9G+XLdZ/yHI/V8dmy/BDAQ1Qdjr8lZVJvrK9uTo1ByhNgH 6ZN/vS2lV0yoILfx+z/UGjHI+gzDnkdG82SOpNKE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chris Ye , Jiri Kosina , Sasha Levin Subject: [PATCH 5.4 28/98] HID: add HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE for Gamevice devices Date: Tue, 1 Dec 2020 09:53:05 +0100 Message-Id: <20201201084656.256506383@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201201084652.827177826@linuxfoundation.org> References: <20201201084652.827177826@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chris Ye [ Upstream commit f59ee399de4a8ca4d7d19cdcabb4b63e94867f09 ] Kernel 5.4 introduces HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE, devices need to be set explicitly with this flag. Signed-off-by: Chris Ye Signed-off-by: Jiri Kosina Signed-off-by: Sasha Levin --- drivers/hid/hid-ids.h | 4 ++++ drivers/hid/hid-quirks.c | 4 ++++ 2 files changed, 8 insertions(+) -- 2.27.0 diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index d173badafcf1f..6b1c26e6fa4a3 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -451,6 +451,10 @@ #define USB_VENDOR_ID_FRUCTEL 0x25B6 #define USB_DEVICE_ID_GAMETEL_MT_MODE 0x0002 +#define USB_VENDOR_ID_GAMEVICE 0x27F8 +#define USB_DEVICE_ID_GAMEVICE_GV186 0x0BBE +#define USB_DEVICE_ID_GAMEVICE_KISHI 0x0BBF + #define USB_VENDOR_ID_GAMERON 0x0810 #define USB_DEVICE_ID_GAMERON_DUAL_PSX_ADAPTOR 0x0001 #define USB_DEVICE_ID_GAMERON_DUAL_PCS_ADAPTOR 0x0002 diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index abee4e950a4ee..60d188a704e5e 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -85,6 +85,10 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_FUTABA, USB_DEVICE_ID_LED_DISPLAY), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_SAT_ADAPTOR), HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_GREENASIA, USB_DEVICE_ID_GREENASIA_DUAL_USB_JOYPAD), HID_QUIRK_MULTI_INPUT }, + { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_GV186), + HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, + { HID_USB_DEVICE(USB_VENDOR_ID_GAMEVICE, USB_DEVICE_ID_GAMEVICE_KISHI), + HID_QUIRK_INCREMENT_USAGE_ON_DUPLICATE }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_DRIVING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FIGHTING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_HAPP, USB_DEVICE_ID_UGCI_FLYING), HID_QUIRK_BADPAD | HID_QUIRK_MULTI_INPUT },