From 4c538d4e3386262348f56190960f599c12ffc0ab Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Sun, 28 Dec 2003 20:13:21 -0800 Subject: [PATCH] [PATCH] Watchdog update Kconfig: Reflect new watchdog Documentation directory. [USB] hid blacklist addition: Add the Berkshire Products USB PC Watchdog to the hid blacklist. This to avoid problems with USB-Disconnects when the card feels it should reboot... --- drivers/char/watchdog/Kconfig | 4 ++-- drivers/usb/input/hid-core.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig index d425936b49897..ee35079195026 100644 --- a/drivers/char/watchdog/Kconfig +++ b/drivers/char/watchdog/Kconfig @@ -17,7 +17,7 @@ config WATCHDOG implementation entirely in software (which can sometimes fail to reboot the machine) and a driver for hardware watchdog boards, which are more robust and can also keep track of the temperature inside - your computer. For details, read + your computer. For details, read in the kernel source. The watchdog is usually used together with the watchdog daemon @@ -114,7 +114,7 @@ config PCWATCHDOG This card simply watches your kernel to make sure it doesn't freeze, and if it does, it reboots your computer after a certain amount of time. This driver is like the WDT501 driver but for different - hardware. Please read . The PC + hardware. Please read . The PC watchdog cards can be ordered from . To compile this driver as a module, choose M here: the diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index c7e8833162188..7dd22bd5e7bbf 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c @@ -1354,6 +1354,9 @@ void hid_init_reports(struct hid_device *hid) #define USB_VENDOR_ID_A4TECH 0x09DA #define USB_DEVICE_ID_A4TECH_WCP32PU 0x0006 +#define USB_VENDOR_ID_BERKSHIRE 0x0c98 +#define USB_DEVICE_ID_BERKSHIRE_PCWD 0x1140 + struct hid_blacklist { __u16 idVendor; __u16 idProduct; @@ -1403,6 +1406,7 @@ struct hid_blacklist { { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET }, { USB_VENDOR_ID_ESSENTIAL_REALITY, USB_DEVICE_ID_ESSENTIAL_REALITY_P5, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK }, + { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE }, { 0, 0 } }; -- 2.53.0