From 2660deaaaf77f324187e4873cfaacce6d190d477 Mon Sep 17 00:00:00 2001 From: hselasky Date: Sat, 31 Dec 2011 15:49:07 +0000 Subject: [PATCH] MFC r228235 and r228236: Minor code simplification. No functional change. git-svn-id: svn://svn.freebsd.org/base/stable/9@229124 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- lib/libusb/libusb10.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index 0a7c1e6b1..0be318a10 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -417,9 +417,12 @@ libusb_open_device_with_vid_pid(libusb_context *ctx, uint16_t vendor_id, 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 @@ -427,13 +430,10 @@ libusb_open_device_with_vid_pid(libusb_context *ctx, uint16_t vendor_id, */ if (pdesc->idVendor == vendor_id && pdesc->idProduct == product_id) { - if (libusb_open(devs[j], &pdev) < 0) - pdev = NULL; + libusb_open(devs[j], &pdev); break; } } - if (j == i) - pdev = NULL; libusb_free_device_list(devs, 1); DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave"); -- 2.45.0