From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753163Ab3CACPd (ORCPT ); Thu, 28 Feb 2013 21:15:33 -0500 Received: from hydra.sisk.pl ([212.160.235.94]:48323 "EHLO hydra.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752440Ab3CACPc (ORCPT ); Thu, 28 Feb 2013 21:15:32 -0500 From: "Rafael J. Wysocki" To: "Liu, Chuansheng" Cc: "Li, Fei" , "gregkh@linuxfoundation.org" , "Lan, Tianyu" , "stern@rowland.harvard.edu" , "sarah.a.sharp@linux.intel.com" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 4/5 V2] usb: call pm_runtime_put_sync in pm_runtime_get_sync failed case Date: Fri, 01 Mar 2013 03:22:21 +0100 Message-ID: <1500812.76gqUM2HnU@vostro.rjw.lan> User-Agent: KMail/4.9.5 (Linux/3.8.0; KDE/4.9.5; x86_64; ; ) In-Reply-To: <27240C0AC20F114CBF8149A2696CBE4A24264B@SHSMSX101.ccr.corp.intel.com> References: <1362037031.6212.3.camel@fli24-HP-Compaq-8100-Elite-CMT-PC> <1362042384.6212.25.camel@fli24-HP-Compaq-8100-Elite-CMT-PC> <27240C0AC20F114CBF8149A2696CBE4A24264B@SHSMSX101.ccr.corp.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, March 01, 2013 02:07:54 AM Liu, Chuansheng wrote: > > > -----Original Message----- > > From: Li, Fei > > Sent: Thursday, February 28, 2013 5:06 PM > > To: gregkh@linuxfoundation.org; Lan, Tianyu; stern@rowland.harvard.edu; > > sarah.a.sharp@linux.intel.com > > Cc: rjw@sisk.pl; linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org; Liu, > > Chuansheng; Li, Fei > > Subject: [PATCH 4/5 V2] usb: call pm_runtime_put_sync in > > pm_runtime_get_sync failed case > > > > > > Even in failed case of pm_runtime_get_sync, the usage_count > > is incremented. In order to keep the usage_count with correct > > value and runtime power management to behave correctly, call > > pm_runtime_put(_sync) in such case. > > > > Signed-off-by Liu Chuansheng > > Signed-off-by: Li Fei > > --- > > drivers/usb/core/hub.c | 3 ++- > > 1 files changed, 2 insertions(+), 1 deletions(-) > > > > diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c > > index 5480352..f72dede 100644 > > --- a/drivers/usb/core/hub.c > > +++ b/drivers/usb/core/hub.c > > @@ -3148,12 +3148,13 @@ int usb_port_resume(struct usb_device *udev, > > pm_message_t msg) > > > > if (port_dev->did_runtime_put) { > > status = pm_runtime_get_sync(&port_dev->dev); > > - port_dev->did_runtime_put = false; > > if (status < 0) { > > dev_dbg(&udev->dev, "can't resume usb port, status %d\n", > > status); > > + pm_runtime_put_sync(&port_dev->dev); > Rechecked the usb similar codes, in usb_autoresume_device() and usb_autopm_get_interface(), > when pm_runtime_get_sync() failed, the paired pm_runtime_put_sync() will be called. > Alan and Rafael, is it reasonable to consider this cleanup patch also? Thanks. You can very well use pm_runtime_put_noidle() here too. Then, it will be kind of clear what it's for. > > > return status; > > } > > + port_dev->did_runtime_put = false; > > } > > > > /* Skip the initial Clear-Suspend step for a remote wakeup */ > > -- > > 1.7.4.1 Thanks, Rafael -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.