X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=windows.c;h=bad62bf5806f063ce639824bdaec420c381c003d;hb=b328a48b0fd8ce51f400b5e06bc1e2ab52e3c9ae;hp=38ea0cedef7349260c5af7623a268393fea2f914;hpb=6c444ade550dcd1d911261a0e508f6fc1b17c973;p=libserialport.git diff --git a/windows.c b/windows.c index 38ea0ce..bad62bf 100644 --- a/windows.c +++ b/windows.c @@ -253,7 +253,7 @@ static void enumerate_hub(struct sp_port *port, char *hub_name, /* get the number of ports of the hub */ if (DeviceIoControl(hub_device, IOCTL_USB_GET_NODE_INFORMATION, &hub_info, size, &hub_info, size, &size, NULL)) - /* enumarate the ports of the hub */ + /* enumerate the ports of the hub */ enumerate_hub_ports(port, hub_device, hub_info.u.HubInformation.HubDescriptor.bNumberOfPorts, parent_path); @@ -353,9 +353,10 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port) CONFIGRET cr; /* check if this is the device we are looking for */ - if (!(device_key = SetupDiOpenDevRegKey(device_info, &device_info_data, - DICS_FLAG_GLOBAL, 0, - DIREG_DEV, KEY_QUERY_VALUE))) + device_key = SetupDiOpenDevRegKey(device_info, &device_info_data, + DICS_FLAG_GLOBAL, 0, + DIREG_DEV, KEY_QUERY_VALUE); + if (device_key == INVALID_HANDLE_VALUE) continue; size = sizeof(value); if (RegQueryValueExA(device_key, "PortName", NULL, &type, (LPBYTE)value, @@ -448,7 +449,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port) free(escaped_port_name); CloseHandle(handle); - /* retrive USB device details from the device descriptor */ + /* retrieve USB device details from the device descriptor */ get_usb_details(port, device_info_data.DevInst); } break;