From patchwork Tue Dec 13 00:23:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Torokhov X-Patchwork-Id: 9471625 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 166D6607D3 for ; Tue, 13 Dec 2016 00:23:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F313F28537 for ; Tue, 13 Dec 2016 00:23:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E79492853B; Tue, 13 Dec 2016 00:23:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C63E628537 for ; Tue, 13 Dec 2016 00:23:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752707AbcLMAXK (ORCPT ); Mon, 12 Dec 2016 19:23:10 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35745 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751615AbcLMAXJ (ORCPT ); Mon, 12 Dec 2016 19:23:09 -0500 Received: by mail-pf0-f196.google.com with SMTP id i88so1118055pfk.2; Mon, 12 Dec 2016 16:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=UImjRIyPLcwphKXnfBc0dLJGHW5ZYBOlBoILQvqGjJM=; b=grFaAh2t7lQqJH2KQh1A331lzYuUTPs2exfsez6MNCz/XhMMXTTR3+Un99qhHqJeuG SWncI+vQoztNp84BnaDg/hhOOTp+32U51WTT8Navd32BGklCVaeC2EVCZJdKqMkIhcwz GChrawENgbhTDO1cqbaYzZxUC/lBhJ5puKhSUgVtZ75WNvDs37OIdzDfslgG7d0N3ooK c44k8ms+DMxzlCxxKzTgw6e7CA7k1mFjZa87BcTVxs03Xw3dTUIdsvrq4REhJoMdqXfZ K7Vg7vf5SIkcwaGceToXpRKaMSE7uI5kbZXFjYxdvhQWiIYThK2XjHruMI7KqeHtCGwT UpmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=UImjRIyPLcwphKXnfBc0dLJGHW5ZYBOlBoILQvqGjJM=; b=DCPW97HccsCGdQu/+eVPj0wl+HaftO5ad8SOlulHO+ob7Sa4Ptqn9tMpMgQncgUalB BTdeLFfg8I3bIeQ5M+rzRoocxL+l2Kd0WmVQ7rzMJPQMsq9exkX/B+jESUroWUGQdjfb 8je13c+hzTMe2UU5SqOH7RBDRnrwcoVqb82A4RA8RQvj0zME4hp8DaSSuSL7/Cpl1NpE L5XkRLSGIG7m3my/fwcePc6Wa16cWplvP4Pkrzh/DFt+lbdTeU2rpFu1Q7I/Vh4509sd utV1Is6Xdee8EfbputATuyzjRK3XmwdPs6apnn5aQOtz5WtXsew/uzSOdYgkS14cND8+ D5hg== X-Gm-Message-State: AKaTC014JS62PtZAK7EY0Uo3kpOdTqi3vh15GtAaDoOZdvhNnWMPUi63RJVWJq1gGgQzqg== X-Received: by 10.84.217.70 with SMTP id e6mr189822223plj.161.1481588588946; Mon, 12 Dec 2016 16:23:08 -0800 (PST) Received: from dtor-ws ([2620:0:1000:1311:84ca:cb68:b724:aed7]) by smtp.gmail.com with ESMTPSA id s65sm78471704pgb.25.2016.12.12.16.23.07 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Mon, 12 Dec 2016 16:23:07 -0800 (PST) Date: Mon, 12 Dec 2016 16:23:05 -0800 From: Dmitry Torokhov To: Jiri Kosina Cc: Benjamin Tissoires , Andrew Rodland , robert.de.rooy@gmail.com, mahasler@gmail.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] HID: usbhid: fix more Mayflash adapters (HID_QUIRK_MULTI_INPUT) Message-ID: <20161213002305.GA30732@dtor-ws> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andrew Rodland Add "Mayflash GameCube Controller Adapter for Wii U and PC USB" and "Mayflash PS3 Game Controller Adapter" to the list of devices needing HID_QUIRK_MULTI_INPUT. These devices have 4 controller ports, and without the quirk they all become one very large joystock device. With the quirk they're recognized as 4 separate joysticks. Signed-off-by: Andrew Rodland Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=115841 [dtor: picked up Andrew's patch, added the PS3 controller data from bugzilla info] Signed-off-by: Dmitry Torokhov Reviewed-by: Benjamin Tissoires --- drivers/hid/hid-ids.h | 2 ++ drivers/hid/usbhid/hid-quirks.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 575aa65..63824f1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -317,6 +317,8 @@ #define USB_VENDOR_ID_DRAGONRISE 0x0079 #define USB_DEVICE_ID_DRAGONRISE_WIIU 0x1800 +#define USB_DEVICE_ID_DRAGONRISE_PS3 0x1801 +#define USB_DEVICE_ID_DRAGONRISE_GAMECUBE 0x1843 #define USB_VENDOR_ID_DWAV 0x0eef #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index e6cfd32..6f8736a 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -81,6 +81,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CORSAIR, USB_DEVICE_ID_CORSAIR_STRAFE, HID_QUIRK_NO_INIT_REPORTS | HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, + { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_GAMECUBE, HID_QUIRK_MULTI_INPUT }, + { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT }, { USB_VENDOR_ID_ELAN, HID_ANY_ID, HID_QUIRK_ALWAYS_POLL }, { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET },