Date: Sun, 14 Sep 2008 21:35:00 GMT From: Andrew Thompson <thompsa@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 149778 for review Message-ID: <200809142135.m8ELZ02r079488@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=149778 Change 149778 by thompsa@thompsa_burger on 2008/09/14 21:34:48 ata-usb, umass and ustorage are all generic drivers, let all other usb modules try to attach first. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#7 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#10 edit .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/storage/ata-usb2.c#7 (text) ==== @@ -284,6 +284,10 @@ if (uaa->usb2_mode != USB_MODE_HOST) { return (ENXIO); } + if (uaa->use_generic == 0) { + /* give other drivers a try first */ + return (ENXIO); + } id = usb2_get_interface_descriptor(uaa->iface); if ((!id) || (id->bInterfaceClass != UICLASS_MASS)) { return (ENXIO); ==== //depot/projects/usb/src/sys/dev/usb2/storage/umass2.c#10 (text+ko) ==== @@ -1396,6 +1396,10 @@ if (uaa->usb2_mode != USB_MODE_HOST) { return (ENXIO); } + if (uaa->use_generic == 0) { + /* give other drivers a try first */ + return (ENXIO); + } temp = umass_probe_proto(dev, uaa); return (temp.error); ==== //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#10 (text+ko) ==== @@ -294,6 +294,10 @@ if (uaa->usb2_mode != USB_MODE_DEVICE) { return (ENXIO); } + if (uaa->use_generic == 0) { + /* give other drivers a try first */ + return (ENXIO); + } /* Check for a standards compliant device */ id = usb2_get_interface_descriptor(uaa->iface); if ((id == NULL) ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809142135.m8ELZ02r079488>