From bf21ee8d9120a58f5a2a8541b63bfce092d09d41 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Mon, 2 Jul 2007 04:55:56 +0000 Subject: [PATCH] WD Firewire/USB Combo hangs under load on USB interface. Fix with these quirks. Submitted by: John Pettitt PR: 79140 Approved by: re@ (blanket) --- sys/dev/usb/umass.c | 4 ++++ sys/dev/usb/usbdevs | 1 + 2 files changed, 5 insertions(+) diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index 19b252a8a082..c8c07a077623 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 ff6aaffea9ff..3fa232f57207 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