summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authorgavin <gavin@FreeBSD.org>2010-07-26 21:22:57 +0000
committergavin <gavin@FreeBSD.org>2010-07-26 21:22:57 +0000
commit3bd5b8e150019521bb7c38ec067ba8ef5d47e0a3 (patch)
tree5006d0bec12c4cefae108e3f4bf62baaa367dafb /sys/dev
parent675bce13402fd1afeed6eb2ea1fa0f0776355ac6 (diff)
downloadFreeBSD-src-3bd5b8e150019521bb7c38ec067ba8ef5d47e0a3.zip
FreeBSD-src-3bd5b8e150019521bb7c38ec067ba8ef5d47e0a3.tar.gz
Prevent uhid(4) from attaching to the Gembird Silver Shield remote power
plug. Note that the Vendor ID 0x04b4 is officially assigned to Cypress, so use that instead of adding a second vendor with an identical ID, in the same way other similar cases are treated in usb/usbdevs. PR: usb/132785 Submitted by: Dirk-Willem van Gulik <dirkx webweaving.org> MFC after: 1 week
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/quirk/usb_quirk.c1
-rw-r--r--sys/dev/usb/usbdevs1
2 files changed, 2 insertions, 0 deletions
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index f1ffcdc8..01cd609 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -111,6 +111,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
USB_QUIRK(APC, UPS, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(BELKIN, F6C550AVR, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(CYBERPOWER, 1500CAVRLCD, 0x0000, 0xffff, UQ_HID_IGNORE),
+ USB_QUIRK(CYPRESS, SILVERSHIELD, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(DELORME, EARTHMATE, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(ITUNERNET, USBLCD2X20, 0x0000, 0xffff, UQ_HID_IGNORE),
USB_QUIRK(ITUNERNET, USBLCD4X20, 0x0000, 0xffff, UQ_HID_IGNORE),
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 1bedc1b..8445738 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1268,6 +1268,7 @@ product CYPRESS IKARILASER 0x121f Ikari Laser SteelSeries ApS
product CYPRESS USBRS232 0x5500 USB-RS232 Interface
product CYPRESS SLIM_HUB 0x6560 Slim Hub
product CYPRESS XX6830XX 0x6830 PATA Storage Device
+product CYPRESS SILVERSHIELD 0xfd13 Gembird Silver Shield PM
/* Daisy Technology products */
product DAISY DMC 0x6901 USB MultiMedia Reader
OpenPOWER on IntegriCloud