X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fjtag%2Fdrivers%2Flibusb0_common.c;fp=src%2Fjtag%2Fdrivers%2Flibusb0_common.c;h=16dd4ecba6323af6f119060cb77effd4eff9ab26;hp=4b3bde1ec0a6c67d36c4d3f9704e8e2e755191ca;hb=96549bf0121a7cff08885ddca22ab7a1c362ea24;hpb=b171c7ab16e1cbad3ca2a6a2cb0a26a3da735424

diff --git a/src/jtag/drivers/libusb0_common.c b/src/jtag/drivers/libusb0_common.c
index 4b3bde1ec0..16dd4ecba6 100644
--- a/src/jtag/drivers/libusb0_common.c
+++ b/src/jtag/drivers/libusb0_common.c
@@ -125,13 +125,9 @@ int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
 
 int jtag_libusb_get_pid(struct jtag_libusb_device *dev, uint16_t *pid)
 {
-	struct libusb_device_descriptor dev_desc;
+	if (!dev)
+		return ERROR_FAIL;
 
-	if (libusb_get_device_descriptor(dev, &dev_desc) == 0) {
-		*pid = dev_desc.idProduct;
-
-		return 0;
-	}
-
-	return -ENODEV;
+	*pid = dev->descriptor.idProduct;
+	return ERROR_OK;
 }