Message ID | 20200902081445.3291-1-kraxel@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | usb-host: restrict workaround to new libusb versions | expand |
On 9/2/20 10:14 AM, Gerd Hoffmann wrote: > Fixes build failures with old kernels (USBDEVFS_GET_SPEED missing), > on the assumtion that distros with old kernels also have old libusb. > > Reported-by: Alex Bennée <alex.bennee@linaro.org> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > hw/usb/host-libusb.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index 08604f787fdf..c5d38cb09c06 100644 > --- a/hw/usb/host-libusb.c > +++ b/hw/usb/host-libusb.c > @@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) > usb_host_ep_update(s); > > libusb_speed = libusb_get_device_speed(dev); > -#ifdef CONFIG_LINUX > +#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) > if (hostfd && libusb_speed == 0) { > /* > * Workaround libusb bug: libusb_get_device_speed() does not > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 08604f787fdf..c5d38cb09c06 100644 --- a/hw/usb/host-libusb.c +++ b/hw/usb/host-libusb.c @@ -942,7 +942,7 @@ static int usb_host_open(USBHostDevice *s, libusb_device *dev, int hostfd) usb_host_ep_update(s); libusb_speed = libusb_get_device_speed(dev); -#ifdef CONFIG_LINUX +#if LIBUSB_API_VERSION >= 0x01000107 && defined(CONFIG_LINUX) if (hostfd && libusb_speed == 0) { /* * Workaround libusb bug: libusb_get_device_speed() does not
Fixes build failures with old kernels (USBDEVFS_GET_SPEED missing), on the assumtion that distros with old kernels also have old libusb. Reported-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- hw/usb/host-libusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)