diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-21 14:22:17 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-21 14:22:17 -0500 |
| commit | f91f33452be939b38c3b16ba1fab35c27221e7ec (patch) | |
| tree | 577c3d994d443afb01e707471cc6f5bba223d7ef /drivers/net/usb/cdc_mbim.c | |
| parent | 8141ed9fcedb278f4a3a78680591bef1e55f75fb (diff) | |
| parent | 6b4ef60299e30daa8643218fde6152d8a01e2d4b (diff) | |
Merge branch 'usb_cdc_fixes'
Bjørn Mork says:
====================
The 2 first patches in this series are required to make the Sierra
Wireless MC7710 card work in MBIM mode. They may also be
required for other Qualcomm firmware based MBIM devices.
Patch #1 was previously posted as a standalone patch. This version
is a replacement, removing a theoretical NULL pointer exception.
Patch #3 fixes a bug I introduced in v3.7
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/cdc_mbim.c')
| -rw-r--r-- | drivers/net/usb/cdc_mbim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index 42f51c71ec1f..3a5673aa1c37 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -366,7 +366,7 @@ err: static const struct driver_info cdc_mbim_info = { .description = "CDC MBIM", - .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN, + .flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN | FLAG_SEND_ZLP, .bind = cdc_mbim_bind, .unbind = cdc_mbim_unbind, .manage_power = cdc_mbim_manage_power, |