diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 11:26:04 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 11:26:04 +0300 |
| commit | 38452af2424dc99854c78523d74b260fa8a984f0 (patch) | |
| tree | 0dc49c27e1a58a0b35c23db05d85d2e8571ea471 /drivers/net/usb/cdc_ncm.c | |
| parent | dcb32d9913b7ed527b135a7e221f8d14b67bb952 (diff) | |
| parent | be8a18e2e98e04a5def5887d913b267865562448 (diff) | |
| download | linux-38452af2424dc99854c78523d74b260fa8a984f0.tar.xz | |
Merge branch 'x86/asm' into x86/mm, to resolve conflicts
Conflicts:
tools/testing/selftests/x86/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/usb/cdc_ncm.c')
| -rw-r--r-- | drivers/net/usb/cdc_ncm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 53759c315b97..877c9516e781 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -854,6 +854,13 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ if (cdc_ncm_init(dev)) goto error2; + /* Some firmwares need a pause here or they will silently fail + * to set up the interface properly. This value was decided + * empirically on a Sierra Wireless MC7455 running 02.08.02.00 + * firmware. + */ + usleep_range(10000, 20000); + /* configure data interface */ temp = usb_set_interface(dev->udev, iface_no, data_altsetting); if (temp) { |