From patchwork Wed Jun 1 09:13:50 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Metzmacher X-Patchwork-Id: 98152 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 64BA3B6EE9 for ; Wed, 1 Jun 2011 19:26:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161390Ab1FAJ0I (ORCPT ); Wed, 1 Jun 2011 05:26:08 -0400 Received: from mo-p05-ob.rzone.de ([81.169.146.180]:64308 "EHLO mo-p05-ob.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161376Ab1FAJ0C (ORCPT ); Wed, 1 Jun 2011 05:26:02 -0400 X-Greylist: delayed 706 seconds by postgrey-1.27 at vger.kernel.org; Wed, 01 Jun 2011 05:26:01 EDT X-RZG-AUTH: :IXQkeEW8Yfo/5haL0ckzWIsAYh739YBunhBBa3aCCiaR1pO3uOmbj2ao6A== X-RZG-CLASS-ID: mo05 Received: from localhost.localdomain (dvm01.metzemix.de [85.214.18.123]) by post.strato.de (klopstock mo42) (RZmta 25.18) with (EDH-RSA-DES-CBC3-SHA encrypted) ESMTPA id J001f9n5180SNc ; Wed, 1 Jun 2011 11:14:19 +0200 (MEST) From: Stefan Metzmacher To: Oliver Neukum Cc: Greg Kroah-Hartman , linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Stefan Metzmacher Subject: [PATCH] usbnet/cdc_ncm: add missing .reset_resume hook Date: Wed, 1 Jun 2011 11:13:50 +0200 Message-Id: <1306919630-13426-2-git-send-email-metze@samba.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1306919630-13426-1-git-send-email-metze@samba.org> References: <1306919630-13426-1-git-send-email-metze@samba.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- drivers/net/usb/cdc_ncm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index cdd3ae4..3257aaa 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -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, };