d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify libusb_open_device_with_vid_pid(): Only set

Browse Source 
pdev to non-NULL on success instead of unconditonally
setting it and maybe resetting it later.

Submitted by:	Christoph Mallon
MFC after:	3 days
This commit is contained in:
Hans Petter Selasky 2011-12-03 16:30:47 +00:00
parent dc93480306
commit 3f709d07c5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libusb/libusb10.c
View File

@ -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
@ -431,8 +434,6 @@ libusb_open_device_with_vid_pid(libusb_context *ctx, uint16_t vendor_id,
break;
}
}
if (j == i)
pdev = NULL;
libusb_free_device_list(devs, 1);
DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave");