From patchwork Tue Oct 28 14:38:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 5177701 Return-Path: X-Original-To: patchwork-linux-arm@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 B97329F318 for ; Tue, 28 Oct 2014 14:41:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E70BE200F0 for ; Tue, 28 Oct 2014 14:41:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2667A200D6 for ; Tue, 28 Oct 2014 14:41:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xj7vW-0005nd-Ga; Tue, 28 Oct 2014 14:39:14 +0000 Received: from mail-lb0-f173.google.com ([209.85.217.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Xj7v4-0005RO-Fj for linux-arm-kernel@lists.infradead.org; Tue, 28 Oct 2014 14:38:47 +0000 Received: by mail-lb0-f173.google.com with SMTP id l4so725828lbv.4 for ; Tue, 28 Oct 2014 07:38:24 -0700 (PDT) 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:in-reply-to :references; bh=rSiliV1GcOyJAax5AL6rbJhksBUYoAlH4WX1WRMDctY=; b=BswGUvlJufnRj0yLjwa2PkJe+8ec/faM5ucFz9mvRmvcy1FeVy/6/JN+T/bEmO65d0 ut4Fiwhgp038hLkmrSEoiGtg3ERDKr6CU6hXspUysPmO3xMF/O6phs9WfVeKJNqbDJLL mLSnX5rUANvg7F5ee8lczSG8WymXIRWZXLZWIh+4Oh+4PPloneg5AQ68pDdNycZ2zzGz 2e1KiMGZ9l//xBOCZJuvMrTm1VMOJsXtbuvQczx262ht+5j3kO/9zwR3yUva3B37WnXW j43gk1oecYBhaF9kUIFm0f4U0xDDB3kNrWPUX7E0NFpncWwJIQYKE/9NkY/LzHbQYJ28 n9mg== X-Gm-Message-State: ALoCoQnxIskTbL+20/W2fLjQ/pmJ66pb6bpxEHH4XufD2GPaeqymhtSGi3CX5CIHK+eE4WxfjxK6 X-Received: by 10.152.22.74 with SMTP id b10mr4557064laf.16.1414507102872; Tue, 28 Oct 2014 07:38:22 -0700 (PDT) Received: from uffe-Latitude-E6430s.lan (90-231-160-185-no158.tbcn.telia.com. [90.231.160.185]) by mx.google.com with ESMTPSA id qg4sm680886lbb.36.2014.10.28.07.38.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Oct 2014 07:38:22 -0700 (PDT) From: Ulf Hansson To: "Rafael J. Wysocki" , Len Brown , Pavel Machek , linux-pm@vger.kernel.org Subject: [PATCH 2/4] PM / Domains: Don't allow an existing generic PM domain data Date: Tue, 28 Oct 2014 15:38:08 +0100 Message-Id: <1414507090-516-3-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414507090-516-1-git-send-email-ulf.hansson@linaro.org> References: <1414507090-516-1-git-send-email-ulf.hansson@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141028_073846_719269_A85D5639 X-CRM114-Status: GOOD ( 13.03 ) X-Spam-Score: -0.7 (/) Cc: Simon Horman , Ulf Hansson , Kevin Hilman , Russell King , Philipp Zabel , Geert Uytterhoeven , Wolfram Sang , Greg Kroah-Hartman , Mark Brown , Dmitry Torokhov , Magnus Damm , Tomasz Figa , linux-samsung-soc@vger.kernel.org, Alan Stern , Ben Dooks , Jinkun Hong , Kukjin Kim , Sylwester Nawrocki , Aaron Lu , Jack Dai , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 While adding devices to the generic PM domain we allocate data for the struct generic_pm_domain_data. Don't allow existing generic_pm_domain_data in this case, since that indicates the device is already being added from another context. Let's instead return an error. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 7546242..9d511c7 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1423,9 +1423,9 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, spin_lock_irq(&dev->power.lock); - dev->pm_domain = &genpd->domain; if (dev->power.subsys_data->domain_data) { - gpd_data = to_gpd_data(dev->power.subsys_data->domain_data); + ret = -EINVAL; + goto out; } else { gpd_data = gpd_data_new; dev->power.subsys_data->domain_data = &gpd_data->base; @@ -1433,6 +1433,8 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, if (td) gpd_data->td = *td; + dev->pm_domain = &genpd->domain; + spin_unlock_irq(&dev->power.lock); if (genpd->attach_dev)