diff options
| author | Andriy Gapon <avg@FreeBSD.org> | 2011-05-18 07:40:12 +0000 |
|---|---|---|
| committer | Andriy Gapon <avg@FreeBSD.org> | 2011-05-18 07:40:12 +0000 |
| commit | cd10bffa61fbecc3f1a8563bf8e773e780ed581b (patch) | |
| tree | 833b4150a8fe2d233e2c19647530dc7996195493 /sys/dev/usb/storage | |
| parent | a5c44f92bfe1540bdfc14080933465e5cf2510e8 (diff) | |
Notes
Diffstat (limited to 'sys/dev/usb/storage')
| -rw-r--r-- | sys/dev/usb/storage/umass.c | 5 | ||||
| -rw-r--r-- | sys/dev/usb/storage/ustorage_fs.c | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/dev/usb/storage/umass.c b/sys/dev/usb/storage/umass.c index de6ad9da9a92..158d8432d7db 100644 --- a/sys/dev/usb/storage/umass.c +++ b/sys/dev/usb/storage/umass.c @@ -782,6 +782,7 @@ umass_probe_proto(device_t dev, struct usb_attach_arg *uaa) uint32_t proto = umass_get_proto(uaa->iface); memset(&ret, 0, sizeof(ret)); + ret.error = BUS_PROBE_GENERIC; /* Search for protocol enforcement */ @@ -870,10 +871,6 @@ umass_probe(device_t dev) if (uaa->usb_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); diff --git a/sys/dev/usb/storage/ustorage_fs.c b/sys/dev/usb/storage/ustorage_fs.c index c62c96b74cc2..dbf025ab895e 100644 --- a/sys/dev/usb/storage/ustorage_fs.c +++ b/sys/dev/usb/storage/ustorage_fs.c @@ -334,10 +334,6 @@ ustorage_fs_probe(device_t dev) if (uaa->usb_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 = usbd_get_interface_descriptor(uaa->iface); if ((id == NULL) || @@ -346,7 +342,7 @@ ustorage_fs_probe(device_t dev) (id->bInterfaceProtocol != UIPROTO_MASS_BBB)) { return (ENXIO); } - return (0); + return (BUS_PROBE_GENERIC); } static int |
