From patchwork Tue Aug 7 09:04:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tushar Behera X-Patchwork-Id: 1284401 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B255DDF280 for ; Tue, 7 Aug 2012 09:05:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751297Ab2HGJFn (ORCPT ); Tue, 7 Aug 2012 05:05:43 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:51522 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751152Ab2HGJFm (ORCPT ); Tue, 7 Aug 2012 05:05:42 -0400 Received: by pbbrr13 with SMTP id rr13so4006010pbb.19 for ; Tue, 07 Aug 2012 02:05:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=PpLQbh7yAW66z8fxCzjsbBe4Eq5Q/joS2M71w5zsxbY=; b=agnsnSar0gj5khdlsVbZakJusVrpC1shWn8jmr6Uf8RsuoO8pjgtvyQ9uKdBP8Mm17 XKKXTPco5j32LfihjcNL+dbrqhnf6eOJYunjOP3moCFQOszAAUSkBmTFBkedcqMpkBVQ TK2ay9JyjUKEjaUmCq4AsYL1pDRD6FpRxccbiO9227BxmEvDVSvGxqPDjJYNWzzEDLUT H7Yn2WgZvScPC6ggrKE4sQilNG6S1ql6Pcw/cUM7UNoU0VM8TOqle/1uznidqkjBglum 0TRDIm8/XBn941cIHpW1n0i0jyKVNRFWAH5o/h2pyfo/PNRBdYNAZ7gfbjgfbCvL3Cky gDMA== Received: by 10.68.219.65 with SMTP id pm1mr1409584pbc.121.1344330341502; Tue, 07 Aug 2012 02:05:41 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id qd2sm10796699pbb.29.2012.08.07.02.05.38 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 07 Aug 2012 02:05:40 -0700 (PDT) From: Tushar Behera To: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: len.brown@intel.com, pavel@ucw.cz, rjw@sisk.pl, patches@linaro.org Subject: [PATCH] PM / Domains: Not return error when dev_pm_get_subsys_data returns 1 Date: Tue, 7 Aug 2012 14:34:16 +0530 Message-Id: <1344330256-6939-1-git-send-email-tushar.behera@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQnpXF7u0psX2r9guC0ldm7tEjxbVgPjDWMFEDIdK85u44PBBNXpaJRUqSsrseqnyC+8i2It Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Commit 1d5fcfec22 ("PM / Domains: Add device domain data reference counter") returns error when dev_pm_get_subsys_data() returns a non-zero value. However, dev_pm_get_subsys_data() returns 1 when dev->power.subsys_data is allocated during this call. Hence we should only check for the error codes in the return value. Without this patch, following errors are encountered while adding devices to powerdomain on Origen board (based on EXYNOS4210). exynos_pm_add_dev_to_genpd: error in adding exynos4-fb.0 device to pd-lcd0 powerdomain Signed-off-by: Tushar Behera --- drivers/base/power/domain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index ba3487c..f6802cb 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1323,7 +1323,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, } ret = dev_pm_get_subsys_data(dev); - if (ret) + if (ret < 0) goto out; genpd->device_count++; @@ -1358,7 +1358,7 @@ int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev, if (gpd_data != gpd_data_new) __pm_genpd_free_dev_data(dev, gpd_data_new); - return ret; + return (ret < 0) ? : 0; } /**