port libftdi to libusb-1.0 branch, master, updated. v0.17-220-g56631be

[libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx]

The branch, master has been updated
       via  56631bed49236cc5f3c2b66da38eca5567867310 (commit)
      from  7879216a49775d82f1abafc7463f0d83a3df905b (commit)


- Log -----------------------------------------------------------------
commit 56631bed49236cc5f3c2b66da38eca5567867310
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date:   Tue Jul 5 18:03:26 2011 +0200

    ftdi_usb_find_all: Only search for default devices if both VID AND PID are 0

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

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

diff --git a/src/ftdi.c b/src/ftdi.c
index 4dc47bd..852b3ff 100644
--- a/src/ftdi.c
+++ b/src/ftdi.c
@@ -293,8 +293,10 @@ int ftdi_usb_find_all(struct ftdi_context *ftdi, struct 
ftdi_device_list **devli
         if (libusb_get_device_descriptor(dev, &desc) < 0)
             ftdi_error_return_free_device_list(-6, 
"libusb_get_device_descriptor() failed", devs);
 
-        if ((vendor != 0 && product != 0 && desc.idVendor == vendor && 
desc.idProduct == product) ||
-            ((desc.idVendor == 0x403) && (desc.idProduct == 0x6001 || 
desc.idProduct == 0x6010
+        if (((vendor != 0 && product != 0) && 
+             desc.idVendor == vendor && desc.idProduct == product) ||
+            ((vendor == 0 && product == 0) && 
+             (desc.idVendor == 0x403) && (desc.idProduct == 0x6001 || 
desc.idProduct == 0x6010
                                           || desc.idProduct == 0x6011 || 
desc.idProduct == 0x6014)))
         {
             *curdev = (struct ftdi_device_list*)malloc(sizeof(struct 
ftdi_device_list));


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