| Message ID | 20200910131504.11341-3-alex.bennee@linaro.org |
|---|---|
| State | Accepted |
| Commit | 4969e697c15ac536d5c0700381d5d026ef7f0588 |
| Headers | show |
| Series | testing and other mix fixes | expand |
On Thu, 10 Sep 2020 14:14:56 +0100 Alex Bennée <alex.bennee@linaro.org> wrote: > From: Gerd Hoffmann <kraxel@redhat.com> > > 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> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Message-Id: <20200902081445.3291-1-kraxel@redhat.com> > Message-Id: <20200909112742.25730-3-alex.bennee@linaro.org> Can we get this merged to fix travis-ci builds, please. > > diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c > index 08604f787fd..c5d38cb09c0 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
diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c index 08604f787fd..c5d38cb09c0 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