diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-06-27 15:18:17 +0200 |
| commit | b740e76936c14354a9c5676a3eed839ea8472c41 (patch) | |
| tree | dd0b74f64007dba28fcf12595af893e367d307ff /drivers/uwb/i1480/dfu/usb.c | |
| parent | drm/atomic-helper: Simplify commit tracking locking (diff) | |
| parent | Backmerge tag 'v4.12-rc7' into drm-next (diff) | |
| download | linux-b740e76936c14354a9c5676a3eed839ea8472c41.tar.xz linux-b740e76936c14354a9c5676a3eed839ea8472c41.zip | |
Merge remote-tracking branch 'airlied/drm-next' into drm-misc-next
Required for Daniel's drm_vblank_cleanup cleanup
Diffstat (limited to 'drivers/uwb/i1480/dfu/usb.c')
| -rw-r--r-- | drivers/uwb/i1480/dfu/usb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index 6345e85822a4..a50cf45e530f 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c @@ -341,6 +341,7 @@ error_submit_ep1: static int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id) { + struct usb_device *udev = interface_to_usbdev(iface); struct i1480_usb *i1480_usb; struct i1480 *i1480; struct device *dev = &iface->dev; @@ -352,8 +353,8 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id) iface->cur_altsetting->desc.bInterfaceNumber); goto error; } - if (iface->num_altsetting > 1 - && interface_to_usbdev(iface)->descriptor.idProduct == 0xbabe) { + if (iface->num_altsetting > 1 && + le16_to_cpu(udev->descriptor.idProduct) == 0xbabe) { /* Need altsetting #1 [HW QUIRK] or EP1 won't work */ result = usb_set_interface(interface_to_usbdev(iface), 0, 1); if (result < 0) |