Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/32892 ) 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/+/32892 Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org> --- M usbdev.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved 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", -- To view, visit https://review.coreboot.org/c/flashrom/+/32892 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: 1.1.x Gerrit-Change-Id: I08c1c363ce2d6603e46efecc61d3910e02314fca Gerrit-Change-Number: 32892 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h@gmx.de> Gerrit-Reviewer: Nico Huber <nico.h@gmx.de> Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph@9elements.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net> Gerrit-MessageType: merged