svn commit: r200757 - stable/8/lib/libusb

[Sean Farley]

Author: scf
Date: Sun Dec 20 18:57:43 2009
New Revision: 200757
URL: http://svn.freebsd.org/changeset/base/200757

Log:
  Merge from head to stable/8:
  
  r200424:
  Fix libusb_open_device_with_vid_pid() to return a NULL if no device is
  found instead of the last device in its search list.
  
  Reviewed by:	thompsa

Modified:
  stable/8/lib/libusb/libusb10.c
Directory Properties:
  stable/8/lib/libusb/   (props changed)
  stable/8/lib/libusb/usb.h   (props changed)

Modified: stable/8/lib/libusb/libusb10.c
==============================================================================
--- stable/8/lib/libusb/libusb10.c	Sun Dec 20 18:53:34 2009	(r200756)
+++ stable/8/lib/libusb/libusb10.c	Sun Dec 20 18:57:43 2009	(r200757)
@@ -379,8 +379,6 @@ libusb_open_device_with_vid_pid(libusb_c
 	if ((i = libusb_get_device_list(ctx, &devs)) < 0)
 		return (NULL);
 
-	pdev = NULL;
-
 	for (j = 0; j < i; j++) {
 		pdev = devs[j]->os_priv;
 		pdesc = libusb20_dev_get_device_desc(pdev);
@@ -396,6 +394,8 @@ libusb_open_device_with_vid_pid(libusb_c
 			break;
 		}
 	}
+	if (j == i)
+		pdev = NULL;
 
 	libusb_free_device_list(devs, 1);
 	DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave");