Messages in this thread Patch in this message | | | Date | Wed, 15 Jun 2011 16:59:57 -0700 | From | Greg KH <> | Subject | [34/89] usbnet/cdc_ncm: add missing .reset_resume hook |
| |
2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------
From: Stefan Metzmacher <metze@samba.org>
commit 85e3c65fa3a1d0542c181510a950a2be7733ff29 upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/net/usb/cdc_ncm.c | 1 + 1 file changed, 1 insertion(+)
--- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -1254,6 +1254,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, };
| |