diff options
| author | avg <avg@FreeBSD.org> | 2011-05-18 11:38:36 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2011-05-18 11:38:36 +0000 |
| commit | 920b1a821200b8f5b739d32645cc0777eface44c (patch) | |
| tree | 47bada7836d6a2c68aa98049cb386ca68fe5ecc7 /sys/netgraph/bluetooth | |
| parent | dbbccdc36fd8c4755d769df4cbb7c2695ee8ee27 (diff) | |
| download | FreeBSD-src-920b1a821200b8f5b739d32645cc0777eface44c.zip FreeBSD-src-920b1a821200b8f5b739d32645cc0777eface44c.tar.gz | |
usb: fix a missed use of use_generic in r222051
Submitted by: gcooper
Pointyhat to: avg
MFC after: 1 month
X-MFC with: r222051
Diffstat (limited to 'sys/netgraph/bluetooth')
| -rw-r--r-- | sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c index ee7fc35..a13ef4d 100644 --- a/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c +++ b/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c @@ -409,6 +409,7 @@ static int ubt_probe(device_t dev) { struct usb_attach_arg *uaa = device_get_ivars(dev); + int error; if (uaa->usb_mode != USB_MODE_HOST) return (ENXIO); @@ -416,14 +417,14 @@ ubt_probe(device_t dev) if (uaa->info.bIfaceIndex != 0) return (ENXIO); - if (uaa->use_generic == 0) - return (ENXIO); - if (usbd_lookup_id_by_uaa(ubt_ignore_devs, sizeof(ubt_ignore_devs), uaa) == 0) return (ENXIO); - return (usbd_lookup_id_by_uaa(ubt_devs, sizeof(ubt_devs), uaa)); + error = usbd_lookup_id_by_uaa(ubt_devs, sizeof(ubt_devs), uaa); + if (error == 0) + return (BUS_PROBE_GENERIC); + return (error); } /* ubt_probe */ /* |
