Date: Wed, 18 May 2011 11:38:36 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r222055 - head/sys/netgraph/bluetooth/drivers/ubt Message-ID: <201105181138.p4IBcaos090515@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Wed May 18 11:38:36 2011 New Revision: 222055 URL: http://svn.freebsd.org/changeset/base/222055 Log: usb: fix a missed use of use_generic in r222051 Submitted by: gcooper Pointyhat to: avg MFC after: 1 month X-MFC with: r222051 Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Modified: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c ============================================================================== --- head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Wed May 18 11:28:23 2011 (r222054) +++ head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c Wed May 18 11:38:36 2011 (r222055) @@ -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 */ /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105181138.p4IBcaos090515>