From: Pete Batard <pete@akeo.ie>
Date: Wed, 3 Oct 2012 22:52:16 +0000 (+0100)
Subject: Windows: Fix early abort in libusb_close
X-Git-Tag: upstream/1.0.21~575
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09759d5836766fb3b886824cd669bc0dfc149d00;p=platform%2Fupstream%2Flibusb.git

Windows: Fix early abort in libusb_close

* We're calling winusbx_close with SUB_API_NOTSET, so
  we should attempt to initialize it first.
* Issue reported by Ramon Zambelli and Frank Hibbeln
---

diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c
index fce4d43..332a368 100644
--- a/libusb/os/windows_usb.c
+++ b/libusb/os/windows_usb.c
@@ -2594,6 +2594,8 @@ static void winusbx_close(int sub_api, struct libusb_device_handle *dev_handle)
 	HANDLE file_handle;
 	int i;
 
+	if (sub_api == SUB_API_NOTSET)
+		sub_api = priv->sub_api;
 	if (!WinUSBX[sub_api].initialized)
 		return;
 
diff --git a/libusb/version_nano.h b/libusb/version_nano.h
index 9c8b259..7cb278e 100644
--- a/libusb/version_nano.h
+++ b/libusb/version_nano.h
@@ -1 +1 @@
-#define LIBUSB_NANO 10576
+#define LIBUSB_NANO 10577