From: Aurelien Jacobs <redacted>
Date: Tue, 22 Sep 2015 22:30:06 +0000 (+0200)
Subject: scpi_usbtmc_libusb: remove libusb_clear_halt() hack which is not useful anymore
X-Git-Tag: libsigrok-0.4.0~190
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=7977054d61554b6b24195f2255935881a92d935d;p=libsigrok.git

scpi_usbtmc_libusb: remove libusb_clear_halt() hack which is not useful anymore
---

diff --git a/src/scpi/scpi_usbtmc_libusb.c b/src/scpi/scpi_usbtmc_libusb.c
index d7b7ef99..9f49dd1d 100644
--- a/src/scpi/scpi_usbtmc_libusb.c
+++ b/src/scpi/scpi_usbtmc_libusb.c
@@ -622,26 +622,11 @@ static int scpi_usbtmc_libusb_close(struct sr_scpi_dev_inst *scpi)
 {
 	struct scpi_usbtmc_libusb *uscpi = scpi->priv;
 	struct sr_usb_dev_inst *usb = uscpi->usb;
-	struct libusb_device *dev;
-	struct libusb_device_descriptor des;
 	int ret;
 
 	if (!usb->devhdl)
 		return SR_ERR;
 
-	dev = libusb_get_device(usb->devhdl);
-	libusb_get_device_descriptor(dev, &des);
-	if (des.idVendor == 0x1ab1 && des.idProduct == 0x0588
-			&& scpi->firmware_version >= 24) {
-		/* Rigol DS1000 with firmware > 0.2.4 needs this. */
-		if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_in_ep)) < 0)
-			sr_err("Failed to clear halt/stall condition for EP %d: %s.",
-			       uscpi->bulk_out_ep, libusb_error_name(ret));
-		if ((ret = libusb_clear_halt(usb->devhdl, uscpi->bulk_out_ep)) < 0)
-			sr_err("Failed to clear halt/stall condition for EP %d: %s.",
-			       uscpi->bulk_out_ep, libusb_error_name(ret));
-	}
-
 	scpi_usbtmc_local(uscpi);
 
 	if ((ret = libusb_release_interface(usb->devhdl, uscpi->interface)) < 0)