The branch, master has been updated
via 4effe1488192344225c2d6e80a6013a5a8fee8fd (commit)
from def58aa9bb045ccfbd2c521bae527f77ba3d916b (commit)
- Log -----------------------------------------------------------------
commit 4effe1488192344225c2d6e80a6013a5a8fee8fd
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Wed Feb 22 11:56:02 2017 +0100
ftdi_eeprom_set_strings(): No need for an open device
-----------------------------------------------------------------------
Summary of changes:
src/ftdi.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/ftdi.c b/src/ftdi.c
index 360acf5..d811ac5 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -2613,7 +2613,6 @@ int ftdi_eeprom_set_strings(struct ftdi_context *ftdi,
char * manufacturer,
\retval 0: all fine
\retval -1: ftdi context invalid
\retval -2: ftdi eeprom buffer invalid
- \retval -3: no USB device connected
*/
int ftdi_eeprom_get_strings(struct ftdi_context *ftdi,
char *manufacturer, int mnf_len,
@@ -2624,15 +2623,11 @@ int ftdi_eeprom_get_strings(struct ftdi_context *ftdi,
if (ftdi == NULL)
ftdi_error_return(-1, "No struct ftdi_context");
-
if (ftdi->eeprom == NULL)
- ftdi_error_return(-2,"No struct ftdi_eeprom");
+ ftdi_error_return(-2, "No struct ftdi_eeprom");
eeprom = ftdi->eeprom;
- if (ftdi->usb_dev == NULL)
- ftdi_error_return(-3, "No connected device or device not yet opened");
-
if (manufacturer)
{
strncpy(manufacturer, eeprom->manufacturer, mnf_len);
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
|