From: Antonio Ospite <ao2@ao2.it>
Date: Sun, 25 Jan 2015 22:27:37 +0000 (+0100)
Subject: am7xxx: clean up the exit path in open_device()
X-Git-Tag: v0.1.6~37
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/cdc8537bdeed76136a82d1b6a3afd082620d3721

am7xxx: clean up the exit path in open_device()
---

diff --git a/src/am7xxx.c b/src/am7xxx.c
index 3334615..fedf11a 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -747,12 +747,15 @@ static int open_device(am7xxx_context *ctx,
 		debug(ctx, "libusb_claim_interface failed\n");
 		debug(ctx, "Cannot claim interface %hhu\n",
 		      (*dev)->desc->interface_number);
-out_libusb_close:
-		libusb_close((*dev)->usb_device);
-		(*dev)->usb_device = NULL;
+		goto out_libusb_close;
 	}
 out:
 	return ret;
+
+out_libusb_close:
+	libusb_close((*dev)->usb_device);
+	(*dev)->usb_device = NULL;
+	return ret;
 }
 
 typedef enum {