X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-dso%2Fdso.c;h=06037e29278e775ad5d13e4e8ec0811709d6d25d;hb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;hp=79c160088dfa06d930669f4677be4f55f8f3b2d0;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/hantek-dso/dso.c b/src/hardware/hantek-dso/dso.c
index 79c16008..06037e29 100644
--- a/src/hardware/hantek-dso/dso.c
+++ b/src/hardware/hantek-dso/dso.c
@@ -29,8 +29,6 @@
 
 #define NUM_CHANNELS 2
 
-extern struct sr_dev_driver hantek_dso_driver_info;
-
 static int send_begin(const struct sr_dev_inst *sdi)
 {
 	struct sr_usb_dev_inst *usb;
@@ -76,8 +74,7 @@ static int dso_getmps(libusb_device *dev)
 	const struct libusb_interface_descriptor *intf_dsc;
 	int mps;
 
-	if (libusb_get_device_descriptor(dev, &des) != 0)
-		return 0;
+	libusb_get_device_descriptor(dev, &des);
 
 	if (des.bNumConfigurations != 1)
 		return 0;
@@ -112,7 +109,7 @@ err:
 SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 {
 	struct dev_context *devc;
-	struct drv_context *drvc = hantek_dso_driver_info.context;
+	struct drv_context *drvc = sdi->driver->context;
 	struct sr_usb_dev_inst *usb;
 	struct libusb_device_descriptor des;
 	libusb_device **devlist;
@@ -128,11 +125,7 @@ SR_PRIV int dso_open(struct sr_dev_inst *sdi)
 
 	libusb_get_device_list(drvc->sr_ctx->libusb_ctx, &devlist);
 	for (i = 0; devlist[i]; i++) {
-		if ((err = libusb_get_device_descriptor(devlist[i], &des))) {
-			sr_err("Failed to get device descriptor: %s.",
-			       libusb_error_name(err));
-			continue;
-		}
+		libusb_get_device_descriptor(devlist[i], &des);
 
 		if (des.idVendor != devc->profile->fw_vid
 		    || des.idProduct != devc->profile->fw_pid)