From 019bf73bb2677dc7720bc8280527316adcbaa506 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 5 Oct 2010 12:50:53 +0100 Subject: [PATCH] Windows: Fix logic in enumeration of driver name and port number --- libusb/os/windows_usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libusb/os/windows_usb.c b/libusb/os/windows_usb.c index 9498e14..83a4606 100644 --- a/libusb/os/windows_usb.c +++ b/libusb/os/windows_usb.c @@ -1433,7 +1433,7 @@ static int set_device_paths(struct libusb_context *ctx, struct discovered_devs * // Check that the driver installation is OK if ( (!SetupDiGetDeviceRegistryProperty(dev_info, &dev_info_data, SPDRP_INSTALL_STATE, ®_type, (BYTE*)&install_state, 4, &size)) - && (size != 4) ){ + || (size != 4) ){ usbi_warn(ctx, "could not detect installation state of driver for %s: %s", dev_interface_details->DevicePath, windows_error_str(0)); } else if (install_state != 0) { @@ -1445,7 +1445,7 @@ static int set_device_paths(struct libusb_context *ctx, struct discovered_devs * // The SPDRP_ADDRESS for USB devices should be the device port number on the hub if ( (!SetupDiGetDeviceRegistryProperty(dev_info, &dev_info_data, SPDRP_ADDRESS, ®_type, (BYTE*)&port_nr, 4, &size)) - && (size != 4) ){ + || (size != 4) ){ usbi_warn(ctx, "could not retrieve port number for device %s, skipping: %s", dev_interface_details->DevicePath, windows_error_str(0)); continue; -- 2.7.4