mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-29 22:15:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

[usb] fix processing of sibling device instances

Browse source 
* Issue introduced in f88faf1a4f
* Closes #696
This commit is contained in:
Pete Batard 2016-02-21 19:58:48 +00:00
parent c3f47ada06
commit 64828934e0
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/usb.c
View file

@ -194,7 +194,7 @@ BOOL GetUSBDevices(DWORD devnum)
SP_DEVINFO_DATA dev_info_data;
SP_DEVICE_INTERFACE_DATA devint_data;
PSP_DEVICE_INTERFACE_DETAIL_DATA_A devint_detail_data;
DEVINST parent_inst, grandparent_inst, sibling_inst, device_inst;
DEVINST parent_inst, grandparent_inst, device_inst;
DWORD size, i, j, k, l, datatype, drive_index;
DWORD uasp_start = ARRAYSIZE(usbstor_name), card_start = ARRAYSIZE(genstor_name);
ULONG list_size[ARRAYSIZE(usbstor_name)] = { 0 }, list_start[ARRAYSIZE(usbstor_name)] = { 0 }, full_list_size, ulFlags;
@ -396,10 +396,9 @@ BOOL GetUSBDevices(DWORD devnum)
}
if (device_inst != dev_info_data.DevInst) {
// Try the siblings
while (CM_Get_Sibling(&sibling_inst, device_inst, 0) == CR_SUCCESS) {
if (sibling_inst == dev_info_data.DevInst) {
while (CM_Get_Sibling(&device_inst, device_inst, 0) == CR_SUCCESS) {
if (device_inst == dev_info_data.DevInst) {
uuprintf("NOTE: Matched instance from sibling for '%s'", device_id);
device_inst = sibling_inst;
break;
}
}