Applies tow both branches
--
Uwe Bonnes bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
>From 2fd40e625a2e974081c3c272b99b56a9c9d19e01 Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue, 1 Feb 2011 11:27:09 +0100
Subject: Call ftdi_usb_close_internal and not usb_close when descriptor doesn't
match
---
src/ftdi.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index f2853d3..c7856a4 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -669,12 +669,12 @@ int ftdi_usb_open_desc_index(struct ftdi_context *ftdi,
int vendor, int product,
{
if (libusb_get_string_descriptor_ascii(ftdi->usb_dev,
desc.iProduct, (unsigned char *)string, sizeof(string)) < 0)
{
- libusb_close (ftdi->usb_dev);
+ ftdi_usb_close_internal (ftdi);
ftdi_error_return_free_device_list(-8, "unable to fetch
product description", devs);
}
if (strncmp(string, description, sizeof(string)) != 0)
{
- libusb_close (ftdi->usb_dev);
+ ftdi_usb_close_internal (ftdi);
continue;
}
}
--
1.7.1
--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|