summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2019-05-20 11:31:44 +0200
committerNico Huber <nico.h@gmx.de>2019-06-03 12:01:40 +0000
commit620ceb0e8fe63e567b196a34934ae7f0d9d3a3a8 (patch)
tree27dc4b3a01ee3ff6947b86b21c376684a04817b8
parentdc5af547df8b2f852deb5ddad86bb90ff0fc50c0 (diff)
downloadflashrom-620ceb0e8fe63e567b196a34934ae7f0d9d3a3a8.tar.gz
flashrom-620ceb0e8fe63e567b196a34934ae7f0d9d3a3a8.tar.bz2
flashrom-620ceb0e8fe63e567b196a34934ae7f0d9d3a3a8.zip
usbdev: Only match requested USB devicesv1.1-rc2
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>
-rw-r--r--usbdev.c2
1 files changed, 1 insertions, 1 deletions
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",