From patchwork Tue Jan 5 09:26:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 562999 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 9E0D0140324 for ; Tue, 5 Jan 2016 20:26:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=dyUAFa3k; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752163AbcAEJ0Y (ORCPT ); Tue, 5 Jan 2016 04:26:24 -0500 Received: from mail-lf0-f45.google.com ([209.85.215.45]:34500 "EHLO mail-lf0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752129AbcAEJ0P (ORCPT ); Tue, 5 Jan 2016 04:26:15 -0500 Received: by mail-lf0-f45.google.com with SMTP id y184so290381575lfc.1 for ; Tue, 05 Jan 2016 01:26:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=fcJnx8bq8Y9OgZdHrS0/undSPORnH3ib6sUni0GyBsw=; b=dyUAFa3kuTxIoZXLBZ3avGsJHwKlQaoxR900Cj99bx23Rozy+MlKo1B9Yn8NQI2WBP TA68J8JjnsM6sI1CtFXMzbAlRDm50VeSSsHNQKRgeZikcU7sEBPEJo6Q057VO33gmuhJ BpcWLONlTwZ2eKg6MeMsos7/PQucC4mJbF61U= 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:mime-version :content-type:content-transfer-encoding; bh=fcJnx8bq8Y9OgZdHrS0/undSPORnH3ib6sUni0GyBsw=; b=fNIaR23oj4nofqL2uHoC1VRYrMqWTsjLo4zOlJxJ8qyVaYF/JmPPlcWaecnzFP+w+l kKybPEW5tEAHNNUfgBAJAw+3fejzv//EAdX5NEbD4WZSIvt0TjZ3yJw4JVJVEtRVBf+/ wEKA4LB5I/NVCNxEfG54ott/ElYArXVy3gKsvr/XBhQLuM2D2QqJ4LUnKlxWlsfMdyil ypuKbTv8MyAiaGvaudChZ2J3dIrqPrLHoFhsRE009ptTVewQ9JeroNKRZukpAhpHjEpq dYy3RP3P0fM8vm61N9me11bdXnrBuK8pJt9IGTkp8DgEInMZfnQFtNMXreFQ1zfoCJJi pwbA== X-Gm-Message-State: ALoCoQn5tortTnX8fFZ16GBjgCcmAA0QUeuZt7PtROSft9eULZkNi3qMBd8aXDQrSxW2VN+JmtLcK7FOQlzMAaBDmIThBTp82Q== X-Received: by 10.25.22.232 with SMTP id 101mr8865764lfw.44.1451985973390; Tue, 05 Jan 2016 01:26:13 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id kz5sm14838349lbc.7.2016.01.05.01.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jan 2016 01:26:12 -0800 (PST) From: Linus Walleij To: linux-gpio@vger.kernel.org, Alexandre Courbot Cc: Linus Walleij , =?UTF-8?q?Bj=C3=B6rn=20Andersson?= Subject: [PATCH] pinctrl: qcom: fix up errorpath Date: Tue, 5 Jan 2016 10:26:09 +0100 Message-Id: <1451985969-17717-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 MIME-Version: 1.0 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This fixes up: commit 464231fb1fb1360399a2eb11479c47e39facb030 "pinctrl: ssbi-gpio: Be sure to clamp return value" commit b9164f049339006fafe8a52396e0f1997552214a "gpio: ssbi-mpp: Be sure to clamp return value" as I managed to screw up some of the logic when clamping the return values. Cc: Björn Andersson Signed-off-by: Linus Walleij Reviewed-by: Björn Andersson --- drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 4 ++-- drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c index 394ca34bec4a..7bea0df06fb1 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c @@ -487,10 +487,10 @@ static int pm8xxx_gpio_get(struct gpio_chip *chip, unsigned offset) } else { ret = irq_get_irqchip_state(pin->irq, IRQCHIP_STATE_LINE_LEVEL, &state); if (!ret) - ret = state; + ret = !!state; } - return !!ret; + return ret; } static void pm8xxx_gpio_set(struct gpio_chip *chip, unsigned offset, int value) diff --git a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c index 23089d541230..629642b73489 100644 --- a/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c +++ b/drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c @@ -506,9 +506,9 @@ static int pm8xxx_mpp_get(struct gpio_chip *chip, unsigned offset) ret = irq_get_irqchip_state(pin->irq, IRQCHIP_STATE_LINE_LEVEL, &state); if (!ret) - ret = state; + ret = !!state; - return !!ret; + return ret; } static void pm8xxx_mpp_set(struct gpio_chip *chip, unsigned offset, int value)