port libftdi to libusb-1.0 branch, master, updated. v0.17-217-gde40c60

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  de40c606f2a72bbcb27444c6e3c40debb58c8723 (commit)
      from  71ac8745e5d05fe9863a6281c6dd1cb7ece3e74a (commit)


- Log -----------------------------------------------------------------
commit de40c606f2a72bbcb27444c6e3c40debb58c8723
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Tue Jun 28 15:12:14 2011 +0200

    Don't return before cleanup

-----------------------------------------------------------------------

Summary of changes:
 examples/find_all.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/find_all.c b/examples/find_all.c
index 7d1aab4..2f3b4e2 100644
--- a/examples/find_all.c
+++ b/examples/find_all.c
@@ -23,11 +23,10 @@ int main(void)
         return EXIT_FAILURE;
     }
 
-    if ((ret = ftdi_usb_find_all(&ftdic, &devlist, 0x0403, 0x6001)) < 0)
+    if ((ret = ftdi_usb_find_all(&ftdic, &devlist, 0x0403, 0x6010)) < 0)
     {
         fprintf(stderr, "ftdi_usb_find_all failed: %d (%s)\n", ret, 
ftdi_get_error_string(&ftdic));
         retval =  EXIT_FAILURE;
-        return retval;
         goto do_deinit;
     }
 
@@ -41,7 +40,6 @@ int main(void)
         {
             fprintf(stderr, "ftdi_usb_get_strings failed: %d (%s)\n", ret, 
ftdi_get_error_string(&ftdic));
             retval = EXIT_FAILURE;
-            return retval;
             goto done;
         }
         printf("Manufacturer: %s, Description: %s\n\n", manufacturer, 
description);
@@ -52,5 +50,5 @@ done:
 do_deinit:
     ftdi_deinit(&ftdic);
 
-    return EXIT_SUCCESS;
+    return retval;
 }


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