diff options
| author | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-05-29 17:35:09 -0700 |
|---|---|---|
| committer | Chris Dickens <christopher.a.dickens@gmail.com> | 2016-05-29 17:35:09 -0700 |
| commit | 0b947e5f9b2dfffa4def7007f4fb5b23fe2eb05f (patch) | |
| tree | 33255352b28cd4f4c83208404bd746d4d4d7a68b /libusb/os/windows_winusb.h | |
| parent | 578942b5a90cd36b47b11e0992c2e92a05b70d91 (diff) | |
| download | libusb-0b947e5f9b2dfffa4def7007f4fb5b23fe2eb05f.tar.gz | |
Windows: Fix false assertion failure message during enumeration
Commit 1d54ee1b6687c532eca75925f56eb12e2a34ce42 addressed a device
reference leak but introduced a false warning message that occurs
for devices detected in early enumeration passes (e.g. hubs). The
assertion is meant to warn of a mismatch between parent devices but
fails to account for the fact that some devices that are allocated
early do not have a parent device assigned until the later
enumeration passes.
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
Diffstat (limited to 'libusb/os/windows_winusb.h')
| -rw-r--r-- | libusb/os/windows_winusb.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libusb/os/windows_winusb.h b/libusb/os/windows_winusb.h index 303f4a6..49c1df5 100644 --- a/libusb/os/windows_winusb.h +++ b/libusb/os/windows_winusb.h @@ -224,7 +224,7 @@ static inline struct windows_device_priv *_device_priv(struct libusb_device *dev return (struct windows_device_priv *)dev->os_priv; } -static inline void windows_device_priv_init(struct libusb_device *dev) +static inline struct windows_device_priv *windows_device_priv_init(struct libusb_device *dev) { struct windows_device_priv *p = _device_priv(dev); int i; @@ -247,6 +247,8 @@ static inline void windows_device_priv_init(struct libusb_device *dev) p->usb_interface[i].endpoint = NULL; p->usb_interface[i].restricted_functionality = false; } + + return p; } static inline void windows_device_priv_release(struct libusb_device *dev) |