Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp3322168imu; Sun, 11 Nov 2018 12:20:24 -0800 (PST) X-Google-Smtp-Source: AJdET5eyGVuEGeORmkIxv+wALDQu2qRBLVmnLhu/l+NsOKD9qW9EcpPUXTFbme9fUlFL+PCzn9B7 X-Received: by 2002:a63:920a:: with SMTP id o10mr14618769pgd.141.1541967624847; Sun, 11 Nov 2018 12:20:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541967624; cv=none; d=google.com; s=arc-20160816; b=WSPmH4u87NkfKlNKFSp5+1nQjUzcBeqCYm7COSNNNGZAMk9l61UOU/p4KvqLO+bCox qFRdVSCDpUTrnm/4O7OXEMv/FyTiPn/vos2M8ilVH714ak6y5JuvuJGto5rsUDzrxpwy RDOQZmblrVn21ohLqrO4Swa8hC7AEGhzf7wU8IOBnVIpw6Gq+L2DqMCi3kVpXgCDXQev 0btRvmGshNlgMAohKOV0Eqa6qu+ScEBCLJk0SQvVKDhlvLFg2NIumWB/GIcfBS0h1KLe 0rBkDtpO3tiKeSs776YEH8Vj0Uj9fHS2qvoOeXX7BkLGiwsz3yBtB7rLrawNnMKvu9Bx /pHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition; bh=CYS4zrVfOiTkLPApmpBRz8+xa5AoYAlRZEk14ST8o2w=; b=iW3NS12w1Yito6txKtK7xomu7jw6071iONN/n5NhyU2Re0CZse+z2tnVyr8QWkOrcS cdnUNVpZ/uPXCTFqxPYay6/c52QD6iPegOU+yrSSwjpUwkE9fSrUO8BFVtW1ChNKV16p rKqFN2yGlAGnp59m6Ke7RHAdiXX5d5W24uy9CfNysqpsdiTHlmZAQBgNIJXvXj/GsvF/ DvZ0zX9HVinJ38Z9w2W57KqOKCKO0299KMKlQzamWMuG1lKpShEIl0XRRM5sOTGVkM1v GS1L/B6LeMnMepYQNlvqwHC11t/mbbpGGKJiChdbhDgHTq8TVsF6O7TPChPcA8wv2KND f2wg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id be8-v6si14813741plb.143.2018.11.11.12.20.09; Sun, 11 Nov 2018 12:20:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731314AbeKLFz1 (ORCPT + 99 others); Mon, 12 Nov 2018 00:55:27 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:51882 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726519AbeKLFz0 (ORCPT ); Mon, 12 Nov 2018 00:55:26 -0500 Received: from [192.168.4.242] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1gLvss-0000lK-1T; Sun, 11 Nov 2018 19:59:02 +0000 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1gLvsV-0001i0-Rj; Sun, 11 Nov 2018 19:58:39 +0000 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Greg Kroah-Hartman" , "Nico Sneck" Date: Sun, 11 Nov 2018 19:49:05 +0000 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 238/366] usb: quirks: add delay quirks for Corsair Strafe In-Reply-To: X-SA-Exim-Connect-IP: 192.168.4.242 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.61-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Nico Sneck commit bba57eddadda936c94b5dccf73787cb9e159d0a5 upstream. Corsair Strafe appears to suffer from the same issues as the Corsair Strafe RGB. Apply the same quirks (control message delay and init delay) that the RGB version has to 1b1c:1b15. With these quirks in place the keyboard works correctly upon booting the system, and no longer requires reattaching the device. Signed-off-by: Nico Sneck Signed-off-by: Greg Kroah-Hartman Signed-off-by: Ben Hutchings --- drivers/usb/core/quirks.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -228,6 +228,10 @@ static const struct usb_device_id usb_qu /* Corsair K70 RGB */ { USB_DEVICE(0x1b1c, 0x1b13), .driver_info = USB_QUIRK_DELAY_INIT }, + /* Corsair Strafe */ + { USB_DEVICE(0x1b1c, 0x1b15), .driver_info = USB_QUIRK_DELAY_INIT | + USB_QUIRK_DELAY_CTRL_MSG }, + /* Corsair Strafe RGB */ { USB_DEVICE(0x1b1c, 0x1b20), .driver_info = USB_QUIRK_DELAY_INIT | USB_QUIRK_DELAY_CTRL_MSG },