From 4ca575dc5a81587da5affecd2cd97b7c8b4596b3 Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Mon, 20 May 2019 11:31:44 +0200
Subject: 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usbdev.c')

diff --git a/usbdev.c b/usbdev.c
index d793b65d7..764ac046a 100644
--- a/usbdev.c
+++ b/usbdev.c
@@ -54,7 +54,7 @@ static struct libusb_device_handle *get_by_vid_pid_filter(struct libusb_context
 			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",
-- 
cgit v1.2.3