diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-06-01 02:01:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-06-01 21:10:49 -0700 |
| commit | 85e3c65fa3a1d0542c181510a950a2be7733ff29 (patch) | |
| tree | 7efb6a9f3ed34ed52358eef6b4a59659a5fdea94 /drivers/net | |
| parent | 307f73df2b9829ee5a261d1ed432ff683c426cdf (diff) | |
| download | linux-3.10-85e3c65fa3a1d0542c181510a950a2be7733ff29.tar.gz linux-3.10-85e3c65fa3a1d0542c181510a950a2be7733ff29.tar.bz2 linux-3.10-85e3c65fa3a1d0542c181510a950a2be7733ff29.zip | |
usbnet/cdc_ncm: add missing .reset_resume hook
This avoids messages like this after suspend:
cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm?
cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm?
cdc_ncm 2-1.4:1.6: usb0: unregister 'cdc_ncm' usb-0000:00:1d.0-1.4, CDC NCM
This is important for the Ericsson F5521gw GSM/UMTS modem.
Otherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices
belong together.
The cdc_ether module does the same.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/usb/cdc_ncm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index cdd3ae48610..f33ca6aa29e 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -54,7 +54,7 @@ #include <linux/usb/usbnet.h> #include <linux/usb/cdc.h> -#define DRIVER_VERSION "24-May-2011" +#define DRIVER_VERSION "01-June-2011" /* CDC NCM subclass 3.2.1 */ #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 @@ -1234,6 +1234,7 @@ static struct usb_driver cdc_ncm_driver = { .disconnect = cdc_ncm_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, + .reset_resume = usbnet_resume, .supports_autosuspend = 1, }; |