Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755190AbcJLMqA (ORCPT ); Wed, 12 Oct 2016 08:46:00 -0400 Received: from mail.kernel.org ([198.145.29.136]:48926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932908AbcJLMpq (ORCPT ); Wed, 12 Oct 2016 08:45:46 -0400 From: lizf@kernel.org To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Zefan Li Subject: [PATCH 3.4 122/125] Revert "USB: Add device quirk for ASUS T100 Base Station keyboard" Date: Wed, 12 Oct 2016 20:33:58 +0800 Message-Id: <1476275641-4697-122-git-send-email-lizf@kernel.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1476275600-4626-1-git-send-email-lizf@kernel.org> References: <1476275600-4626-1-git-send-email-lizf@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2207 Lines: 68 From: Zefan Li 3.4.113-rc1 review patch. If anyone has any objections, please let me know. ------------------ This reverts commit eea5a87d270e8d6925063019c3b0f3ff61fcb49a. Conflicts: drivers/usb/core/quirks.c include/linux/usb/quirks.h Signed-off-by: Zefan Li --- drivers/usb/core/hub.c | 6 ++---- drivers/usb/core/quirks.c | 4 ---- include/linux/usb/quirks.h | 3 --- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index e0ad5dc..65ff69a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1655,10 +1655,8 @@ void usb_set_device_state(struct usb_device *udev, || new_state == USB_STATE_SUSPENDED) ; /* No change to wakeup settings */ else if (new_state == USB_STATE_CONFIGURED) - wakeup = (udev->quirks & - USB_QUIRK_IGNORE_REMOTE_WAKEUP) ? 0 : - udev->actconfig->desc.bmAttributes & - USB_CONFIG_ATT_WAKEUP; + wakeup = udev->actconfig->desc.bmAttributes + & USB_CONFIG_ATT_WAKEUP; else wakeup = 0; } diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index fd8e60e..32e08dc 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -184,10 +184,6 @@ static const struct usb_device_id usb_interface_quirk_list[] = { { USB_VENDOR_AND_INTERFACE_INFO(0x046d, USB_CLASS_VIDEO, 1, 0), .driver_info = USB_QUIRK_RESET_RESUME }, - /* ASUS Base Station(T100) */ - { USB_DEVICE(0x0b05, 0x17e0), .driver_info = - USB_QUIRK_IGNORE_REMOTE_WAKEUP }, - /* Protocol and OTG Electrical Test Device */ { USB_DEVICE(0x1a0a, 0x0200), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h index 0972470..a67e7d1 100644 --- a/include/linux/usb/quirks.h +++ b/include/linux/usb/quirks.h @@ -30,9 +30,6 @@ descriptor */ #define USB_QUIRK_DELAY_INIT 0x00000040 -/* device generates spurious wakeup, ignore remote wakeup capability */ -#define USB_QUIRK_IGNORE_REMOTE_WAKEUP 0x00000200 - /* device can't handle device_qualifier descriptor requests */ #define USB_QUIRK_DEVICE_QUALIFIER 0x00000100 -- 1.9.1