From patchwork Wed Oct 27 14:45:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 69360 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 27A68B70CD for ; Thu, 28 Oct 2010 01:45:22 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757381Ab0J0OpR (ORCPT ); Wed, 27 Oct 2010 10:45:17 -0400 Received: from mail-qw0-f46.google.com ([209.85.216.46]:36958 "EHLO mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755893Ab0J0OpQ (ORCPT ); Wed, 27 Oct 2010 10:45:16 -0400 Received: by qwf7 with SMTP id 7so44923qwf.19 for ; Wed, 27 Oct 2010 07:45:15 -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=GTQowfPQBSjJwGCJ0bDvDz+YiezwTe4VP4ogYfYMHUA=; b=ZumY1s8okOTefSDwbJqq1auo5UH72Yjjm4iFkVjAidei77yd0JLbKuR/hzyv8JJiO/ Oucug42TlzpmdzqdurqzQcjsIQuQhi9kii3Nng2UnqwD4WQWy0439HipuuzxhXVBFNX9 ufdmJYpYB7piVVWQ1wHdCGCZd+MHzROS16XiE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=PZm88l1jIKnGXjywgZokr1STCr85KdoykpbVLmZ7bKGIisPBp7XFPLuRqndKrujj39 ak4kWOPsWeQv5HyLzq38d+XsbiSU+WXRPVrgLR0zf/ORkC5PMTjcZtaT34o2PApaiuIs wlgCXJLyu6dAo97BgU1LDLqkkbER0mOGm6Mfg= Received: by 10.229.236.193 with SMTP id kl1mr646495qcb.37.1288190715238; Wed, 27 Oct 2010 07:45:15 -0700 (PDT) Received: from localhost ([183.37.3.164]) by mx.google.com with ESMTPS id t35sm8705048qco.6.2010.10.27.07.45.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 27 Oct 2010 07:45:12 -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: runtime pm: fix usb_autopm_get_interface failure Date: Wed, 27 Oct 2010 22:45:03 +0800 Message-Id: <1288190703-3154-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 --- drivers/net/usb/usbnet.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index ca7fc9d..765308f 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -1273,6 +1273,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;