Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753199AbbG0TRV (ORCPT ); Mon, 27 Jul 2015 15:17:21 -0400 Received: from mail-pd0-f175.google.com ([209.85.192.175]:36067 "EHLO mail-pd0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750923AbbG0TRT (ORCPT ); Mon, 27 Jul 2015 15:17:19 -0400 From: Reilly Grant To: Jiri Kosina Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Reilly Grant Subject: [PATCH] HID: use generic driver for ThingM blink(1) if !CONFIG_HID_THINGM Date: Mon, 27 Jul 2015 12:17:06 -0700 Message-Id: <1438024626-36448-1-git-send-email-reillyg@chromium.org> X-Mailer: git-send-email 2.5.0.rc2.392.g76e840b Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1399 Lines: 32 In commit 30ba2fbde1840db44 an LED class driver for this device was added and at the same time it was blacklisted by the hid-generic driver. This patch removes the device from the hid-generic driver's blacklist if the LED class driver is not enabled. Signed-off-by: Reilly Grant --- drivers/hid/hid-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index d9c7cd9..afa744f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -1978,7 +1978,9 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE) }, { HID_USB_DEVICE(USB_VENDOR_ID_STEELSERIES, USB_DEVICE_ID_STEELSERIES_SRWS1) }, { HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) }, +#if IS_ENABLED(CONFIG_HID_THINGM) { HID_USB_DEVICE(USB_VENDOR_ID_THINGM, USB_DEVICE_ID_BLINK1) }, +#endif { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb304) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb323) }, -- 2.5.0.rc2.392.g76e840b -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/