From patchwork Thu Apr 9 15:18:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ivan T. Ivanov" X-Patchwork-Id: 459761 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id F36E91401AD for ; Fri, 10 Apr 2015 01:19:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755519AbbDIPSv (ORCPT ); Thu, 9 Apr 2015 11:18:51 -0400 Received: from mail-wi0-f177.google.com ([209.85.212.177]:38314 "EHLO mail-wi0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755514AbbDIPSm (ORCPT ); Thu, 9 Apr 2015 11:18:42 -0400 Received: by wiun10 with SMTP id n10so102291514wiu.1 for ; Thu, 09 Apr 2015 08:18:41 -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=3IIckyW0KsUm6G3IcrZxI7X9RT1smc1hBGXKsUTKDqA=; b=A49+DX7WB3SODhN25Fl+3aijfiQ23Sea53iPccUlijneT9GEc6JvS5kGq3svjL3yyy DSkN70BQXH6W/67WWW+LkTdil1cDNr5FbTFjidle0NJYr2WyEBEZMJ8M1JNlnMggC+MP 8uBTJNodPV0ZN4vaRT0ln0vEW5iS2S0F0wlkQ5kE1NIbdTqnlZ6x6NKfa8zt2nYw715P ijo1eSKcnft+mlJGxpo2XACGDsgu6xLDVKAo3BBeauFCVZ5E+fCUCWKk+6o2NJaGG3r7 BGLLTDDv2GCEge4c+bv+w5VXIDvpYDp/Ft4GkaicuLeWZsR4LP/yzp25Vspcxon3CyYz FAzw== X-Gm-Message-State: ALoCoQlUyF3VOl0QO06aGIpTXRcS+rYvReVLQFhQPiOzEBLOlg/ABXKJzhbkLjvcrZkYnnRU9kVG X-Received: by 10.180.218.108 with SMTP id pf12mr7248461wic.13.1428592721819; Thu, 09 Apr 2015 08:18:41 -0700 (PDT) Received: from localhost.localdomain ([37.157.136.206]) by mx.google.com with ESMTPSA id ed14sm10383483wic.11.2015.04.09.08.18.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 09 Apr 2015 08:18:41 -0700 (PDT) From: "Ivan T. Ivanov" To: Linus Walleij Cc: Bjorn Andersson , Arnd Bergmann , Soren Brinkmann , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH 2/3] pinctrl: qcom-spmi-gpio: Fix input value report Date: Thu, 9 Apr 2015 18:18:36 +0300 Message-Id: <1428592717-21706-2-git-send-email-ivan.ivanov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1428592717-21706-1-git-send-email-ivan.ivanov@linaro.org> References: <1428592717-21706-1-git-send-email-ivan.ivanov@linaro.org> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Read input buffer when input is enabled, not when it is disabled. Also fix interpretation of the pmic_gpio_read() return code, negative value means an error. Signed-off-by: Ivan T. Ivanov Reviewed-by: Bjorn Andersson --- drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c index 4b21aac..e8b74c6 100644 --- a/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-spmi-gpio.c @@ -466,12 +466,13 @@ static void pmic_gpio_config_dbg_show(struct pinctrl_dev *pctldev, seq_puts(s, " ---"); } else { - if (!pad->input_enabled) { + if (pad->input_enabled) { ret = pmic_gpio_read(state, pad, PMIC_MPP_REG_RT_STS); - if (!ret) { - ret &= PMIC_MPP_REG_RT_STS_VAL_MASK; - pad->out_value = ret; - } + if (ret < 0) + return; + + ret &= PMIC_MPP_REG_RT_STS_VAL_MASK; + pad->out_value = ret; } seq_printf(s, " %-4s", pad->output_enabled ? "out" : "in");