From patchwork Fri Nov 15 11:40:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 3187791 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5F1B29F39E for ; Fri, 15 Nov 2013 11:41:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6EA4920979 for ; Fri, 15 Nov 2013 11:41:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA0E82096B for ; Fri, 15 Nov 2013 11:41:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754438Ab3KOLk6 (ORCPT ); Fri, 15 Nov 2013 06:40:58 -0500 Received: from mail-la0-f42.google.com ([209.85.215.42]:49457 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754182Ab3KOLkv (ORCPT ); Fri, 15 Nov 2013 06:40:51 -0500 Received: by mail-la0-f42.google.com with SMTP id ec20so2679487lab.1 for ; Fri, 15 Nov 2013 03:40:50 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=qvk2nhnEDgnnoaMDP/AIFT+/FybcBWFOBXWxjpYKDx4=; b=W/5jh9F1Ai7SjpC8GOjWtZbpk09N17919AiWtRcF+efcueOnThnI08LdB+lpJmRUVr Eurspi0lMSalSNCqzlOwp4YUCsRCiAkgPWoJL9vwEC23MCscPPfL+heQfTCczKoIGx58 7C1RInyL1tkIu05EfQvzO1lU/j+zXjAXb1muQTQCnTSyVDfLonAJ3vS8UuJIezfDVnyu fhOy0y5aod2i3pSWeuWRu5zMZiCJ5QPf5uDE/HE5u8GXuCvhWLGTbo2phkyk96H/JuIY yBhUcw8XjeXavaaITrr7+nbPehe/TXdskL9yfVAXeDxAlmcPoOtgJuttLFvAiTqyxSBQ McNg== X-Gm-Message-State: ALoCoQlQu32D4LjaUuJEYn0GO6b4P0d0v6YY1rVEpu9Nz1aOgBvNKpTgwUVPjMDlmlS3ovRPaes8 X-Received: by 10.112.13.72 with SMTP id f8mr1023959lbc.40.1384515649998; Fri, 15 Nov 2013 03:40:49 -0800 (PST) Received: from linaro-ulf.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id l10sm1875552lbh.13.2013.11.15.03.40.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Nov 2013 03:40:49 -0800 (PST) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Cc: Greg Kroah-Hartman , linux-pci@vger.kernel.org, linux-usb@vger.kernel.org, Ulf Hansson , Kevin Hilman , Alan Stern Subject: [PATCH 1/2] PM / Runtime: Fix error path for prepare Date: Fri, 15 Nov 2013 12:40:44 +0100 Message-Id: <1384515645-8696-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a device prepare callback for some reason would fail, the PM core prevented the device from going inactive forever. In this case, to reverse the pm_runtime_get_noresume() we invokes the asyncronous pm_runtime_put(), thus restoring the usage count. Cc: Kevin Hilman Cc: Alan Stern Signed-off-by: Ulf Hansson --- drivers/base/power/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index ee039af..2a1b06a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1350,6 +1350,9 @@ static int device_prepare(struct device *dev, pm_message_t state) device_unlock(dev); + if (error) + pm_runtime_put(dev); + return error; }