summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2007-07-02 04:55:56 +0000
committerimp <imp@FreeBSD.org>2007-07-02 04:55:56 +0000
commit03be3cbe9a4999d68c76e2d5336983a576cc33a0 (patch)
tree4367f5517a35d812efdf5e240e7e010350f9d6e2
parent1fb03182c6de3f7f75b2a9da7b8073d4841a2efb (diff)
downloadFreeBSD-src-03be3cbe9a4999d68c76e2d5336983a576cc33a0.zip
FreeBSD-src-03be3cbe9a4999d68c76e2d5336983a576cc33a0.tar.gz
WD Firewire/USB Combo hangs under load on USB interface. Fix with
these quirks. Submitted by: John Pettitt PR: 79140 Approved by: re@ (blanket)
-rw-r--r--sys/dev/usb/umass.c4
-rw-r--r--sys/dev/usb/usbdevs1
2 files changed, 5 insertions, 0 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 19b252a..c8c07a0 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -528,6 +528,10 @@ static struct umass_devdescr_t umass_devdescrs[] = {
UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
NO_QUIRKS
},
+ { USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_COMBO, RID_WILDCARD,
+ UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+ FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE
+ },
{ USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_EXTHDD, RID_WILDCARD,
UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
FORCE_SHORT_INQUIRY | NO_START_STOP | IGNORE_RESIDUE
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index ff6aaff..3fa232f 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -2026,6 +2026,7 @@ product WACOM INTUOSA5 0x0021 Intuos A5
product WACOM GD0912U 0x0022 Intuos 9x12 Graphics Tablet
/* Western Digital products */
+product WESTERN COMBO 0x0200 Firewire USB Combo
product WESTERN EXTHDD 0x0400 External HDD
product WESTERN HUB 0x0500 USB HUB
OpenPOWER on IntegriCloud