Message ID | 38723e6ec5cf70de46fe296fac40235b708a7151.1409831636.git.viresh.kumar@linaro.org |
---|---|
State | Accepted |
Commit | f5b89affe2b2e6a6092f4228baf08a6dd59bfc61 |
Headers | show
Return-Path: <patchwork-forward+bncBCRIZROPVQPBB7FJUGQAKGQEB3ZBVMA@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 663B9202E4 for <linaro@patches.linaro.org>; Thu, 4 Sep 2014 12:03:09 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id v10sf773926pde.6 for <linaro@patches.linaro.org>; Thu, 04 Sep 2014 05:03:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=V/2p+1DE8fn6DxR95rK44+OzM2Ici6T6u8DilhBtqrY=; b=RwlsC8e+4YRUzC4IPSRAh+5Ojh7m+v+xEjxEzh0g/kEBd3Gij6ghT/5AM4uEMls6tV T2eMr03R0ktALCtamwCvNt5wdMEOS88WKUDxikHKAFH/RDRNYRFIEDtHS13eSIBrF57O ZHL+FJwjmAlFKr4Sd4da2+mIRjmZzi62Q3k5oaOCSJCAUiKo833XN3K1D0b913bdOQu1 A07dOXrI0WAxlebGWrdtJ17VUxnD/O/KlsMCvABwkKikJC/tEKvHSD9DNfwQ9SNyXws8 aR/hbKEgwDwhDKM1v2lTlxhvKnGtHS3/ya9HHHKUgHI2gtGBWAk2z6qVnZtegb0g6GV+ yaEA== X-Gm-Message-State: ALoCoQmuL2OuLHwWd0mBsTswPvOZQudSNMQAyKLrUARC4g74/fP8jM/5NaHRTv8BPttzkwDIJ/pk X-Received: by 10.66.248.232 with SMTP id yp8mr2132378pac.22.1409832188474; Thu, 04 Sep 2014 05:03:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.38 with SMTP id i35ls217473qgf.76.gmail; Thu, 04 Sep 2014 05:03:08 -0700 (PDT) X-Received: by 10.221.38.4 with SMTP id tg4mr496593vcb.44.1409832188344; Thu, 04 Sep 2014 05:03:08 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id ci16si2695043vdb.93.2014.09.04.05.03.08 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 05:03:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hq11so10205442vcb.8 for <patchwork-forward@linaro.org>; Thu, 04 Sep 2014 05:03:08 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr1748563vdb.25.1409832188277; Thu, 04 Sep 2014 05:03:08 -0700 (PDT) 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.221.45.67 with SMTP id uj3csp824340vcb; Thu, 4 Sep 2014 05:03:07 -0700 (PDT) X-Received: by 10.70.62.5 with SMTP id u5mr8127472pdr.100.1409832187422; Thu, 04 Sep 2014 05:03:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lp3si3076549pab.230.2014.09.04.05.03.02 for <multiple recipients>; Thu, 04 Sep 2014 05:03:03 -0700 (PDT) Received-SPF: none (google.com: linux-pm-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753913AbaIDMCr (ORCPT <rfc822;amit.pundir@linaro.org> + 15 others); Thu, 4 Sep 2014 08:02:47 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:49994 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774AbaIDMCr (ORCPT <rfc822;linux-pm@vger.kernel.org>); Thu, 4 Sep 2014 08:02:47 -0400 Received: by mail-pa0-f43.google.com with SMTP id et14so20017565pad.2 for <linux-pm@vger.kernel.org>; Thu, 04 Sep 2014 05:02:45 -0700 (PDT) X-Received: by 10.70.130.138 with SMTP id oe10mr7926970pdb.115.1409832164278; Thu, 04 Sep 2014 05:02:44 -0700 (PDT) Received: from localhost ([122.167.123.172]) by mx.google.com with ESMTPSA id fk11sm1516412pdb.91.2014.09.04.05.02.42 for <multiple recipients> (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 04 Sep 2014 05:02:43 -0700 (PDT) From: Viresh Kumar <viresh.kumar@linaro.org> To: sre@kernel.org, dbaryshkov@gmail.com, dwmw2@infradead.org, anton@enomsg.org Cc: linux-pm@vger.kernel.org, linaro-kernel@lists.linaro.org, Viresh Kumar <viresh.kumar@linaro.org> Subject: [PATCH 08/15] power-supply: Propagate error returned by power_supply_find_supply_from_node() Date: Thu, 4 Sep 2014 17:31:29 +0530 Message-Id: <38723e6ec5cf70de46fe296fac40235b708a7151.1409831636.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.0.3.693.g996b0fd In-Reply-To: <2eacd908a8094887cc1796f75ae0513be8a3e36d.1409831636.git.viresh.kumar@linaro.org> References: <2eacd908a8094887cc1796f75ae0513be8a3e36d.1409831636.git.viresh.kumar@linaro.org> In-Reply-To: <cover.1409831636.git.viresh.kumar@linaro.org> References: <cover.1409831636.git.viresh.kumar@linaro.org> Sender: linux-pm-owner@vger.kernel.org Precedence: list List-ID: <patchwork-forward.linaro.org> X-Mailing-List: linux-pm@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: viresh.kumar@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) 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: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> |
diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index 8a86cd1..ab1cf8b 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -221,8 +221,8 @@ static int power_supply_check_supplies(struct power_supply *psy) of_node_put(np); if (ret) { - dev_dbg(psy->dev, "Failed to find supply, defer!\n"); - return -EPROBE_DEFER; + dev_dbg(psy->dev, "Failed to find supply!\n"); + return ret; } } while (np);
Callers of power_supply_find_supply_from_node(), i.e. power_supply_check_supplies(), must propagate the errors returned by it instead of returning their own. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/power/power_supply_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)