From patchwork Thu Feb 27 19:49:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 25470 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 365A320543 for ; Thu, 27 Feb 2014 19:51:34 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id p10sf6523065pdj.11 for ; Thu, 27 Feb 2014 11:51:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=MkvVNkgSstNUI7z36jEfQVLU7g/pZY30nMQAUe1D1aw=; b=D2i7HFLRVYkMFG3eJKguOhwpNznxGKIEU7Qs+Pb7PI7OOz5Q5ExSuGnDN+0pHEn7tY otrsQrFulnnqYo86cmFyuUSF2I8+IAsD0PGNJeg2W+JvIeHdRog1oH1w7+atWYh6Ss3z E04uURPgmIA48f6hnZ507tR4sBABEHoHQF2KKQR3clMMwi379ahCiuXgsN655OObWWH+ T2LbLeCj6BDHavyt3x4c+V3jZZTEG1SoUimOYaWtaJfRP+L9JRd4lqCOu7vhZxl1VXou QneSkLyZGdvN6b+N9gtLifY3o2mLilL93SY1v4ImVl7jvwfvJEQ3ebyGl88yHRO+n/MT T0RA== X-Gm-Message-State: ALoCoQnbMt5V+030+yVwz+XrWZwqjLTVCBFnPa8bRdxVcIg2gmOnYVyBj7niCT4ME77GKkcl6Doo X-Received: by 10.66.102.36 with SMTP id fl4mr6618057pab.20.1393530693335; Thu, 27 Feb 2014 11:51:33 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.180 with SMTP id z49ls796952qgd.59.gmail; Thu, 27 Feb 2014 11:51:33 -0800 (PST) X-Received: by 10.52.95.233 with SMTP id dn9mr10166730vdb.3.1393530693231; Thu, 27 Feb 2014 11:51:33 -0800 (PST) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id cz20si1554084veb.91.2014.02.27.11.51.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 27 Feb 2014 11:51:33 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ij19so3021616vcb.34 for ; Thu, 27 Feb 2014 11:51:33 -0800 (PST) X-Received: by 10.221.34.211 with SMTP id st19mr12174770vcb.5.1393530693162; Thu, 27 Feb 2014 11:51:33 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.130.193 with SMTP id u1csp1512vcs; Thu, 27 Feb 2014 11:51:32 -0800 (PST) X-Received: by 10.68.129.201 with SMTP id ny9mr15300627pbb.70.1393530692230; Thu, 27 Feb 2014 11:51:32 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tg2si5685914pbc.143.2014.02.27.11.51.31; Thu, 27 Feb 2014 11:51:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbaB0Tv3 (ORCPT + 3 others); Thu, 27 Feb 2014 14:51:29 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:57340 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752563AbaB0Tv2 (ORCPT ); Thu, 27 Feb 2014 14:51:28 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s1RJpRSJ025400 for ; Thu, 27 Feb 2014 13:51:27 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1RJpR3j013629 for ; Thu, 27 Feb 2014 13:51:27 -0600 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Thu, 27 Feb 2014 13:51:27 -0600 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s1RJpQI0016661; Thu, 27 Feb 2014 13:51:27 -0600 From: Felipe Balbi To: Linux USB Mailing List CC: Felipe Balbi Subject: [PATCH 4/8] usb: dwc3: omap: fix pm_runtime usage Date: Thu, 27 Feb 2014 13:49:53 -0600 Message-ID: <1393530597-12259-4-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1393530597-12259-1-git-send-email-balbi@ti.com> References: <1393530597-12259-1-git-send-email-balbi@ti.com> MIME-Version: 1.0 Sender: linux-usb-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , even if pm_runtime_get*() fails, it still increments pm usage counter, so we must pm_runtime_put*() in that case too. Fix that observation in dwc3-omap.c. Signed-off-by: Felipe Balbi --- drivers/usb/dwc3/dwc3-omap.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index 558e1b5..1b086bb 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -451,7 +451,7 @@ static int dwc3_omap_probe(struct platform_device *pdev) ret = pm_runtime_get_sync(dev); if (ret < 0) { dev_err(dev, "get_sync failed with err %d\n", ret); - goto err0; + goto err1; } reg = dwc3_omap_readl(omap->base, USBOTGSS_REVISION); @@ -566,8 +566,6 @@ err2: err1: pm_runtime_put_sync(dev); - -err0: pm_runtime_disable(dev); return ret;