d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

atp(4), wsp(4): Return correct priority from probe() method;

Browse Source 
MFC after:	2 weeks
This commit is contained in:
Vladimir Kondratyev 2021-08-25 01:59:17 +03:00
parent d056693d7b
commit 9fa1201d60
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/usb/input/atp.c
View File

@ -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);
}

5
sys/dev/usb/input/wsp.c
View File

@ -720,7 +720,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