The branch, master has been updated
via faa772fe0a9690e681a49ce7529e84cb4d6f5625 (commit)
via 1423b35ca644b152bbe28142f3661e1d4bd413ff (commit)
from a3886df38983951eb4b0abffd17aaf1a9018d42b (commit)
- Log -----------------------------------------------------------------
commit faa772fe0a9690e681a49ce7529e84cb4d6f5625
Author: Uwe Bonnes <[email protected]>
Date: Tue Feb 1 11:27:09 2011 +0100
Call ftdi_usb_close_internal and not usb_close when descriptor doesn't match
commit 1423b35ca644b152bbe28142f3661e1d4bd413ff
Author: Uwe Bonnes <[email protected]>
Date: Tue Feb 1 11:02:24 2011 +0100
Check ftdi pointer before accessing it
-----------------------------------------------------------------------
Summary of changes:
src/ftdi.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index 328a3e6..bb40984 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -617,12 +617,12 @@ int ftdi_usb_open_desc_index(struct ftdi_context *ftdi,
int vendor, int product,
char string[256];
int i = 0;
- if (libusb_init(&ftdi->usb_ctx) < 0)
- ftdi_error_return(-11, "libusb_init() failed");
-
if (ftdi == NULL)
ftdi_error_return(-11, "ftdi context invalid");
+ if (libusb_init(&ftdi->usb_ctx) < 0)
+ ftdi_error_return(-11, "libusb_init() failed");
+
if (libusb_get_device_list(ftdi->usb_ctx, &devs) < 0)
ftdi_error_return(-12, "libusb_get_device_list() failed");
@@ -643,12 +643,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;
}
}
hooks/post-receive
--
port libftdi to libusb-1.0
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to [email protected]
