svn commit: r228236 - head/lib/libusb

[Hans Petter Selasky]

Author: hselasky
Date: Sat Dec  3 16:30:47 2011
New Revision: 228236
URL: http://svn.freebsd.org/changeset/base/228236

Log:
  Simplify libusb_open_device_with_vid_pid(): Only set
  pdev to non-NULL on success instead of unconditonally
  setting it and maybe resetting it later.
  
  Submitted by:	Christoph Mallon
  MFC after:	3 days

Modified:
  head/lib/libusb/libusb10.c

Modified: head/lib/libusb/libusb10.c
==============================================================================
--- head/lib/libusb/libusb10.c	Sat Dec  3 16:19:07 2011	(r228235)
+++ head/lib/libusb/libusb10.c	Sat Dec  3 16:30:47 2011	(r228236)
@@ -417,9 +417,12 @@ 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);
+		struct libusb20_device *tdev;
+
+		tdev = devs[j]->os_priv;
+		pdesc = libusb20_dev_get_device_desc(tdev);
 		/*
 		 * NOTE: The USB library will automatically swap the
 		 * fields in the device descriptor to be of host
@@ -431,8 +434,6 @@ 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");