From patchwork Mon Nov 1 14:05:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 69769 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 C57CBB70CC for ; Tue, 2 Nov 2010 01:06:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757916Ab0KAOGL (ORCPT ); Mon, 1 Nov 2010 10:06:11 -0400 Received: from mail-iw0-f174.google.com ([209.85.214.174]:51492 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756428Ab0KAOGJ (ORCPT ); Mon, 1 Nov 2010 10:06:09 -0400 Received: by iwn10 with SMTP id 10so7075165iwn.19 for ; Mon, 01 Nov 2010 07:06:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=ICNZnjCpfpxL3Iv6PH4pHRMfceaq0sL/iIYrd2G6gb8=; b=CJz7zLV+uWlSNie7c7ieXgHX/snn2WVeOs96u1uNMTi7/zX1CTjJFCZ0nr4yEx38Wg l8r6nMrtTzum5lV+Ah+RCUO/VpB1CglRBVkFIBkd6uIgR6vgKbOqSza3XKrbHC0f0wPM R9cYU5HPxWcqnicXm28K+py+Wbf35N4R/c1wM= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=IHZ0hwz2Pg99JmYQLallwyRyH+ALrCCIc9VjqV3azg1qbIHNwZtFE6FDjNh5J53E9l wQx7Z9V9UxXi6EqvBjJC+RzVmhx/3bt291lbnK0ieexlf+n0WhyjP3mXi9k3CmJqDbwb 5fQeAG+bLFrQ0Uc+8tNxWvfU00b4dyMj3mfDo= Received: by 10.231.13.201 with SMTP id d9mr6549318iba.152.1288620369075; Mon, 01 Nov 2010 07:06:09 -0700 (PDT) Received: from localhost ([116.77.213.72]) by mx.google.com with ESMTPS id w9sm8487631ibc.19.2010.11.01.07.05.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 01 Nov 2010 07:06:07 -0700 (PDT) From: tom.leiming@gmail.com To: netdev@vger.kernel.org, oliver@neukum.org, davem@davemloft.net Cc: Ming Lei , David Brownell , Greg Kroah-Hartman , Ben Hutchings , Joe Perches , Andy Shevchenko , stable@kernel.org Subject: [PATCH] usbnet: fix usb_autopm_get_interface failure(v1) Date: Mon, 1 Nov 2010 22:05:49 +0800 Message-Id: <1288620349-9769-1-git-send-email-tom.leiming@gmail.com> X-Mailer: git-send-email 1.7.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Ming Lei Since usbnet already took usb runtime pm, we have to enable runtime pm for usb interface of usbnet, otherwise usb_autopm_get_interface may return failure and cause 'ifconfig usb0 up' failed if USB_SUSPEND(RUNTIME_PM) is enabled. Cc: David Brownell Cc: Greg Kroah-Hartman Cc: "David S. Miller" Cc: Ben Hutchings Cc: Joe Perches Cc: Oliver Neukum Cc: Andy Shevchenko Cc: stable@kernel.org Signed-off-by: Ming Lei --- v1: include header file --- drivers/net/usb/usbnet.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index ca7fc9d..06b1dee 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -45,6 +45,7 @@ #include #include #include +#include #define DRIVER_VERSION "22-Aug-2005" @@ -1273,6 +1274,16 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) struct usb_device *xdev; int status; const char *name; + struct usb_driver *driver = to_usb_driver(udev->dev.driver); + + /*usbnet already took usb runtime pm, so have to enable the feature + * for usb interface, otherwise usb_autopm_get_interface may return + * failure if USB_SUSPEND(RUNTIME_PM) is enabled. + * */ + if (!driver->supports_autosuspend) { + driver->supports_autosuspend = 1; + pm_runtime_enable(&udev->dev); + } name = udev->dev.driver->name; info = (struct driver_info *) prod->driver_info;