From: Bert Vermeulen <redacted>
Date: Sun, 2 Sep 2012 13:13:00 +0000 (+0200)
Subject: genericdmm/victor-70c: warn if detaching kernel driver fails
X-Git-Tag: dsupstream~712
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=f6b8ffa6c0eb94fa59c0e09f3c4d8bed071167d0;p=libsigrok.git

genericdmm/victor-70c: warn if detaching kernel driver fails
---

diff --git a/hardware/genericdmm/victor-70c.c b/hardware/genericdmm/victor-70c.c
index 169f48ac..435008ff 100644
--- a/hardware/genericdmm/victor-70c.c
+++ b/hardware/genericdmm/victor-70c.c
@@ -270,8 +270,12 @@ static int victor70c_data(struct sr_dev_inst *sdi)
 
 	if (sdi->status == SR_ST_INACTIVE) {
 		/* First time through. */
-		if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1)
-			libusb_detach_kernel_driver(devc->usb->devhdl, 0);
+		if (libusb_kernel_driver_active(devc->usb->devhdl, 0) == 1) {
+			if (libusb_detach_kernel_driver(devc->usb->devhdl, 0) < 0) {
+				sr_err("genericdmm/victor-70c: failed to detach kernel driver");
+				return SR_ERR;
+			}
+		}
 
 		if (libusb_claim_interface(devc->usb->devhdl, 0)) {
 			sr_err("genericdmm/victor-70c: failed to claim interface 0");