From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE9F0C00523 for ; Sat, 4 Jan 2020 03:36:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A6B9E24649 for ; Sat, 4 Jan 2020 03:36:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578108986; bh=CChzUWeLLaPe0nOc57dv6RP8IvbqKhcVPHvsmzJK8LA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YLpbpgfW7+VNv91mC1cz5wfSyDAuOlPemfJ8kBIl0zmWOAxqVY4rGBaaPAKLu4D5+ +nFRBdyhkZhN26FiR8B0ZPYc5gTksH774s1sDSdm4hjy4Tk7/TbJ4fJEs31NUBbJwe BpMNz5I9tAl4JzCnA6aE1BHcp8IFBARoVBbRrKzE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727369AbgADDgY (ORCPT ); Fri, 3 Jan 2020 22:36:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:36928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727274AbgADDgX (ORCPT ); Fri, 3 Jan 2020 22:36:23 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7E0A224649; Sat, 4 Jan 2020 03:36:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578108983; bh=CChzUWeLLaPe0nOc57dv6RP8IvbqKhcVPHvsmzJK8LA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RfPQ0oOjdW7pbWs5t1YRj/6tJh3qq7bYeqmhv3RTP0oQ7gGZbtzxGjc8xi0GrWY7j nsiID5lEyraBJc/bWfsOfO/aZ+Pi6ha5SItwWANzovsNWM1eTGIbrbneM/q0nzSCoS lTTGrPqnU3++AmJP7v5WUEy0uuDyPU/zbZ/RVb54= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Geert Uytterhoeven , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 02/10] gpio: Fix error message on out-of-range GPIO in lookup table Date: Fri, 3 Jan 2020 22:36:11 -0500 Message-Id: <20200104033620.10977-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200104033620.10977-1-sashal@kernel.org> References: <20200104033620.10977-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Geert Uytterhoeven [ Upstream commit d935bd50dd14a7714cbdba9a76435dbb56edb1ae ] When a GPIO offset in a lookup table is out-of-range, the printed error message (1) does not include the actual out-of-range value, and (2) contains an off-by-one error in the upper bound. Avoid user confusion by also printing the actual GPIO offset, and correcting the upper bound of the range. While at it, use "%u" for unsigned int. Sample impact: -requested GPIO 0 is out of range [0..32] for chip e6052000.gpio +requested GPIO 0 (45) is out of range [0..31] for chip e6052000.gpio Fixes: 2a3cf6a3599e9015 ("gpiolib: return -ENOENT if no GPIO mapping exists") Signed-off-by: Geert Uytterhoeven Link: https://lore.kernel.org/r/20191127095919.4214-1-geert+renesas@glider.be Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/gpio/gpiolib.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 104ed299d5ea..e4afe60f8594 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -4320,8 +4320,9 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id, if (chip->ngpio <= p->chip_hwnum) { dev_err(dev, - "requested GPIO %d is out of range [0..%d] for chip %s\n", - idx, chip->ngpio, chip->label); + "requested GPIO %u (%u) is out of range [0..%u] for chip %s\n", + idx, p->chip_hwnum, chip->ngpio - 1, + chip->label); return ERR_PTR(-EINVAL); } -- 2.20.1