David Hendricks has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/32891 )
Change subject: usbdev: Only match requested USB devices ......................................................................
usbdev: Only match requested USB devices
Don't use a device that has the same vendor ID, but a different than requested product ID.
Fixes broken dediprog detection with TOMU in use.
Change-Id: I08c1c363ce2d6603e46efecc61d3910e02314fca Signed-off-by: Patrick Rudolph patrick.rudolph@9elements.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/32891 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Daniel Thompson daniel.thompson@linaro.org Reviewed-by: Nico Huber nico.h@gmx.de --- M usbdev.c 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Daniel Thompson: Looks good to me, but someone else must approve
diff --git a/usbdev.c b/usbdev.c index d793b65..764ac04 100644 --- a/usbdev.c +++ b/usbdev.c @@ -54,7 +54,7 @@ continue; }
- if ((desc.idVendor != vid) && (desc.idProduct != pid)) + if ((desc.idVendor != vid) || (desc.idProduct != pid)) continue;
msg_pdbg("Found USB device %04"PRIx16":%04"PRIx16" at address %d-%d.\n",