From 6e10ece95e23c0a46efeeac556374bc32b73b4f5 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Tue, 21 Jun 2011 16:03:28 +0200 Subject: [PATCH] Only ftdi_init may call libusb_init, or we leak an USB Context --- src/ftdi.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/ftdi.c b/src/ftdi.c index 4cff47c..e3862a8 100644 --- a/src/ftdi.c +++ b/src/ftdi.c @@ -611,7 +611,6 @@ int ftdi_usb_open(struct ftdi_context *ftdi, int vendor, int product) \retval -7: set baudrate failed \retval -8: get product description failed \retval -9: get serial number failed - \retval -11: libusb_init() failed \retval -12: libusb_get_device_list() failed \retval -13: libusb_get_device_descriptor() failed */ @@ -656,9 +655,6 @@ int ftdi_usb_open_desc_index(struct ftdi_context *ftdi, int vendor, int product, 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"); @@ -734,7 +730,6 @@ int ftdi_usb_open_desc_index(struct ftdi_context *ftdi, int vendor, int product, \note The description format may be extended in later versions. \retval 0: all fine - \retval -1: libusb_init() failed \retval -2: libusb_get_device_list() failed \retval -3: usb device not found \retval -4: unable to open device @@ -762,9 +757,6 @@ int ftdi_usb_open_string(struct ftdi_context *ftdi, const char* description) unsigned int bus_number, device_address; int i = 0; - if (libusb_init (&ftdi->usb_ctx) < 0) - ftdi_error_return(-1, "libusb_init() failed"); - if (libusb_get_device_list(ftdi->usb_ctx, &devs) < 0) ftdi_error_return(-2, "libusb_get_device_list() failed"); -- 1.7.1