- Fix a stupid string comparison mistake that lead to false positives in the duplicate device detection (1 and 10 detected as conflict)

svn path=/trunk/; revision=56243
This commit is contained in:
Cameron Gutman 2012-03-27 06:50:01 +00:00
parent dc59b8dfc5
commit 040caf7377

View file

@ -60,11 +60,11 @@ Bus_PlugInDevice (
continue; continue;
//check if the HID matches //check if the HID matches
if (strstr(Device->pnp.hardware_id, CurrentDevice->pnp.hardware_id)) if (!strcmp(Device->pnp.hardware_id, CurrentDevice->pnp.hardware_id))
{ {
//check if UID exists for both and matches //check if UID exists for both and matches
if (Device->flags.unique_id && CurrentDevice->flags.unique_id && if (Device->flags.unique_id && CurrentDevice->flags.unique_id &&
strstr(Device->pnp.unique_id, CurrentDevice->pnp.unique_id)) !strcmp(Device->pnp.unique_id, CurrentDevice->pnp.unique_id))
{ {
/* We have a UID on both but they're the same so we have to ignore it */ /* We have a UID on both but they're the same so we have to ignore it */
DPRINT1("Detected duplicate device: %hs %hs\n", Device->pnp.hardware_id, Device->pnp.unique_id); DPRINT1("Detected duplicate device: %hs %hs\n", Device->pnp.hardware_id, Device->pnp.unique_id);