The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=5a5bab49a064e5d109aed74b7843b2bdd3bc8e52
commit 5a5bab49a064e5d109aed74b7843b2bdd3bc8e52 Author: Vladimir Kondratyev <[email protected]> AuthorDate: 2021-08-24 22:59:17 +0000 Commit: Vladimir Kondratyev <[email protected]> CommitDate: 2021-09-08 00:00:27 +0000 atp(4), wsp(4): Return correct priority from probe() method; (cherry picked from commit 9fa1201d60dc7004f11d950f0fbd277bdcdcaf2d) --- sys/dev/usb/input/atp.c | 4 ++-- sys/dev/usb/input/wsp.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/usb/input/atp.c b/sys/dev/usb/input/atp.c index 3515c08a1a6d..585afbaf1a1b 100644 --- a/sys/dev/usb/input/atp.c +++ b/sys/dev/usb/input/atp.c @@ -2175,11 +2175,11 @@ atp_probe(device_t self) if ((usbd_lookup_id_by_uaa(fg_devs, sizeof(fg_devs), uaa)) == 0) return ((uaa->info.bInterfaceProtocol == UIPROTO_MOUSE) ? - 0 : ENXIO); + BUS_PROBE_DEFAULT : ENXIO); if ((usbd_lookup_id_by_uaa(wsp_devs, sizeof(wsp_devs), uaa)) == 0) if (uaa->info.bIfaceIndex == WELLSPRING_INTERFACE_INDEX) - return (0); + return (BUS_PROBE_DEFAULT); return (ENXIO); } diff --git a/sys/dev/usb/input/wsp.c b/sys/dev/usb/input/wsp.c index a25539e7b939..d2901123ab92 100644 --- a/sys/dev/usb/input/wsp.c +++ b/sys/dev/usb/input/wsp.c @@ -715,7 +715,10 @@ wsp_probe(device_t self) /* check if we are attaching to the first match */ if (uaa->info.bIfaceIndex != i) return (ENXIO); - return (usbd_lookup_id_by_uaa(wsp_devs, sizeof(wsp_devs), uaa)); + if (usbd_lookup_id_by_uaa(wsp_devs, sizeof(wsp_devs), uaa) != 0) + return (ENXIO); + + return (BUS_PROBE_DEFAULT); } static int _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
