The branch, master has been updated
via bc3841238bac9cb6955848fd661bbf19a5ed42c6 (commit)
from 32e2d8b00c3168dd46c34080aa4d83abaf05a685 (commit)
- Log -----------------------------------------------------------------
commit bc3841238bac9cb6955848fd661bbf19a5ed42c6
Author: Denis Sirotkin <reg.libftdi@xxxxxxxxxx>
Date: Fri May 16 17:40:13 2014 +0200
ftdi_usb_get_strings(): Don't try to open an already open device
-----------------------------------------------------------------------
Summary of changes:
src/ftdi.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index b6caf6c..add6dc2 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -413,8 +413,8 @@ int ftdi_usb_get_strings(struct ftdi_context * ftdi, struct
libusb_device * dev,
if ((ftdi==NULL) || (dev==NULL))
return -1;
- if (libusb_open(dev, &ftdi->usb_dev) < 0)
- ftdi_error_return(-4, "libusb_open() failed");
+ if (ftdi->usb_dev == NULL && libusb_open(dev, &ftdi->usb_dev) < 0)
+ ftdi_error_return(-4, "libusb_open() failed");
if (libusb_get_device_descriptor(dev, &desc) < 0)
ftdi_error_return(-11, "libusb_get_device_descriptor() failed");
hooks/post-receive
--
A library to talk to FTDI chips
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
