The branch, master has been updated
via ef15fab5819f38a4e215e7824e90f215bbbc5d0d (commit)
from 90ef163e06dc90aebca58b8e4c99946392e37152 (commit)
- Log -----------------------------------------------------------------
commit ef15fab5819f38a4e215e7824e90f215bbbc5d0d
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date: Wed Jul 14 09:46:12 2010 +0200
Update AUTHORS and fix code indent
-----------------------------------------------------------------------
Summary of changes:
AUTHORS | 1 +
src/ftdi.c | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 9aed93e..f8463e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -39,3 +39,4 @@ see Changelog for full details:
Tim Ansell <mithro@xxxxxxxxxx>
Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Wilfried Holzke <libftdi@xxxxxxxxxx>
+ Yi-Shin Li <ysli@xxxxxxxxxxxxx>
diff --git a/src/ftdi.c b/src/ftdi.c
index af813f3..b42ba14 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -1523,12 +1523,13 @@ int ftdi_transfer_data_done(struct
ftdi_transfer_control *tc)
ret = tc->offset;
/**
* tc->transfer could be NULL if "(size <= ftdi->readbuffer_remaining)"
- * at ftdi_read_data_submit(). Therefore, has to check it here.
+ * at ftdi_read_data_submit(). Therefore, we need to check it here.
**/
- if (tc->transfer) {
- if (tc->transfer->status != LIBUSB_TRANSFER_COMPLETED)
- ret = -1;
- libusb_free_transfer(tc->transfer);
+ if (tc->transfer)
+ {
+ if (tc->transfer->status != LIBUSB_TRANSFER_COMPLETED)
+ ret = -1;
+ libusb_free_transfer(tc->transfer);
}
free(tc);
return ret;
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 libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
