commit 4ca575dc5a81587da5affecd2cd97b7c8b4596b3
author Patrick Rudolph <patrick.rudolph@9elements.com> Mon May 20 11:31:44 2019 +0200
committer David Hendricks <david.hendricks@gmail.com> Mon May 27 19:18:28 2019 +0000
tree f29d091284687337fb0757dbeb64cbe9ac24bb87
parent 93db6e16895287b7ac3a8a8f7f4a4f176547b7ed

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>

usbdev.c

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",