From patchwork Wed Feb 26 10:12:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 868634 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 878342459E4 for ; Wed, 26 Feb 2025 10:12:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740564759; cv=none; b=Dr/GHT1rPfAZdD+JgVY/jpAJaM8zFj5pLHMDJ2/wmU+J3L5TVPOodU11JsZ+IpT/l2oHSFAyP2BKAC+6Bi2V9OUyA816eUHAPVELRT5MygC5lCKqUtE3n+H7Nea82aQvTfQEPlZD5/9FNrsL3zMe79uUi2g+KXddTLTRoRNztt0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740564759; c=relaxed/simple; bh=T+DvWoJ3d600gaZLdiqHUPv0OxB+F9ErVNNtwPoM0so=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CP4RM61wGN9e8TVK8uzJ+CZW28rY2q8qrsrVFMnla3lUI7iexEt2pL5GiAJrG3mC10e6mJ0kPMyCZMpS+3lGLgqEXFFvpMJINwnw+u4K12qGHfXaoGrb/gD7fb3euryz4uXUkfQr4Kg/wrTWlNlri6EMVL7QmcnUH7Xfk1zgZRs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=oykU5rVV; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="oykU5rVV" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-4397e5d5d99so41476415e9.1 for ; Wed, 26 Feb 2025 02:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1740564756; x=1741169556; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qBuSqv8U6oPt+UruofT1eAcRQvGHYTW9Mm81Y61uXjQ=; b=oykU5rVV2nxoCJOvurNAeAOZea2b3Ku6BOry2i7nKHZzN6L3plJD/sfVyqifkcdk/g i1hfmmugKG+7w8q85BK/eHd8Abc46EDsv0QA55NoAVy7Xy6qRu8bFYPOB+03QZfjJmTu TycL6KA8kmmFP41MU0F13gOmuF1EYmOqQ0Ott9GR0/MoIkNRBqUYWxxKGHMym9/uS0dz raxaIxweYgyi3seojouRLDQ2B7fumyClwZswNkyXo7WMUASDOJEIysmLK+ibfUFc5rNx Xbc0yZEAHpxEcWO8NeBJZuXD/lK3rbpIE/DJ41uxzuAyMhp/8AAL8BENG+TUKBK4JvR8 42GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740564756; x=1741169556; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qBuSqv8U6oPt+UruofT1eAcRQvGHYTW9Mm81Y61uXjQ=; b=HKxCwPc3mvGjQIkk7o6HD2nGOKgApnXeRsg26Up6vNov65Zetz69RECwMzTVbNbNj5 GJasMPlz/D66pRVeMqdhteafkOZAvWw0rCpJ1cvZH3LG2iYV2yGkr8c52V9tx/ozHvSV QfRaP7tveyJ0n9T3IAT1YxF7v54H8E/S9iqDiSsy413AxCaoYreubxrltfYPdDsM39YW 9b6GeoLWtNiiATqMqzAdbGo4v7frVWG91OVZ3fCTYFkyACGME09A6Ito+JNUCjnLaIhm dWZUdHMQk4C4Qlwh44PDkCyNfqbpOz2TTrOAd07lCzWtGKt0HRlxP4aTC0GDbmpDBQA/ 8lXQ== X-Gm-Message-State: AOJu0YwOJjf0QDQTVP2ti58Cc+SSiR5ieuj3cAh3ksDClEN8/InnUT7+ elCoLC2kyQEVv4iFsvBceBRZklT3/PpJcBCo7k8vH11B5ySOnSud+Ci9KrVWoI0= X-Gm-Gg: ASbGncvuNfPnVkwctv2Nz7J1luAxEytrXEV2KBpx5S4Z7wCgmXoXywfPriLeVpXfWHh Z+doL8KhqbS8R39/MtYxD1rmOYX8/4aiP7zMuqOyu66ZPtmRYYFQh8nxKnlwcYjYM0xVV2JCb1C wD1GeFYcTdqXN5r3iV2yPuDIXttxunvEsX4VxWFpMjXu7N99QlGA7dbp2zpN7diR42dhTBS2C2W +Ey2ZyCOmsiIIRsmQCXJKUJJa7y5PwNSg7j/lmArQ2qgBF/BF47RpVNQu+ygkn3Bc4b3x1LC9q3 o1ujHtgQTvitr1xZ X-Google-Smtp-Source: AGHT+IGXahza8+pgZHBEcw1zePUFK+hWBCP+n/Guhk4nkRUypakh/M2YyW49+Qbm0D3vBistdRcyPw== X-Received: by 2002:a05:6000:4026:b0:38d:e3e2:27e5 with SMTP id ffacd0b85a97d-390cc5f5cc8mr5148096f8f.5.1740564755790; Wed, 26 Feb 2025 02:12:35 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:7d02:26:5770:658c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390d649cd17sm1483971f8f.79.2025.02.26.02.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 02:12:35 -0800 (PST) From: Bartosz Golaszewski Date: Wed, 26 Feb 2025 11:12:29 +0100 Subject: [PATCH v2 1/3] gpiolib: don't use gpiochip_get_direction() when registering a chip Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250226-retval-fixes-v2-1-c8dc57182441@linaro.org> References: <20250226-retval-fixes-v2-0-c8dc57182441@linaro.org> In-Reply-To: <20250226-retval-fixes-v2-0-c8dc57182441@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Marek Szyprowski , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Andy Shevchenko X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=2606; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=T0U7zjnCJI5TuBh0FRLafeo2x7uRS6C7bNJUfU7L0Jo=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBnvukR0zWoGJb1QaqisH627aepIT6mvQ8MiFtUw 2MpuzffGEqJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZ77pEQAKCRARpy6gFHHX cvhRD/9Y6xIIcxHUuGIo5YT71HKxn5aN04sPKG5awKJX7eZ0TBA18ifJJ66R5EUZs7pAzBQvnKx 4vpUaJ+P8cUm91Ah6eGtOWy71tmB8J96aASVF9qLfB63LKdyJ2/r39KIgD2ZJVFs4Nq4avi/o+K voZ0FEP7GyX2AQuoqueKHMBHmrLxML8kuL8104AUeMlGDQ1olTPKXoO8/bMIbwJTgCRfiWtvZfU IeUCndz6TnI//ruZt7eVqD4y43lAMMlGJRV/WxC3RYn1lKedpVxaHLk25QS1T0+KpsM9upffHTT ZxzREAdYKag4TgoB+VWQR6Iua7u5jOi7Dx2O620k2fC9l0B771Kw08F6n1ruSvv9y/269iBrAFK Xj3j+GSsOlYAIWY+RaoXGXI9Jr2ouYBr98B54BSWzPTwHI/bcRAbaKICCQlflAseMnHx0zIrJBz g+4SunMsmXbOXOaVwqj7aH6R9dwXQFRIGnTroBMCXeK632mBAmVpGK52EG/5yt4wl2ls/khtyNl Fde/jmVJD/ye+0f6xV0XzDmhxEmIKm4Wul9RWRq9xuxGcn2RKtNbYDOJmGQh9gjouvgbuGVGCr7 IFjcZcHAh/0mMU6xL7w5Lzk4IUbKC6l7p4UsdMYgE+P5/LUm6Mmrq7jnKFPZJJPT1FF0PJIRJ6P X3hMKkGo7HVgE0g== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski During chip registration we should neither check the return value of gc->get_direction() nor hold the SRCU lock when calling it. The former is because pin controllers may have pins set to alternate functions and return errors from their get_direction() callbacks. That's alright - we should default to the safe INPUT state and not bail-out. The latter is not needed because we haven't registered the chip yet so there's nothing to protect against dynamic removal. In fact: we currently hit a lockdep splat. Revert to calling the gc->get_direction() callback directly and *not* checking its value. Fixes: 9d846b1aebbe ("gpiolib: check the return value of gpio_chip::get_direction()") Fixes: e623c4303ed1 ("gpiolib: sanitize the return value of gpio_chip::get_direction()") Reported-by: Marek Szyprowski Closes: https://lore.kernel.org/all/81f890fc-6688-42f0-9756-567efc8bb97a@samsung.com/ Reviewed-by: Andy Shevchenko Tested-by: Marek Szyprowski Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index e8678a6c82ea..0d325cc41af3 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1082,24 +1082,19 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, desc->gdev = gdev; - if (gc->get_direction && gpiochip_line_is_valid(gc, desc_index)) { - ret = gpiochip_get_direction(gc, desc_index); - if (ret < 0) - /* - * FIXME: Bail-out here once all GPIO drivers - * are updated to not return errors in - * situations that can be considered normal - * operation. - */ - dev_warn(&gdev->dev, - "%s: get_direction failed: %d\n", - __func__, ret); - - assign_bit(FLAG_IS_OUT, &desc->flags, !ret); - } else { + /* + * We would typically want to use gpiochip_get_direction() here + * but we must not check the return value and bail-out as pin + * controllers can have pins configured to alternate functions + * and return -EINVAL. Also: there's no need to take the SRCU + * lock here. + */ + if (gc->get_direction && gpiochip_line_is_valid(gc, desc_index)) + assign_bit(FLAG_IS_OUT, &desc->flags, + !gc->get_direction(gc, desc_index)); + else assign_bit(FLAG_IS_OUT, &desc->flags, !gc->direction_input); - } } ret = of_gpiochip_add(gc); From patchwork Wed Feb 26 10:12:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 868633 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 26AB42459E2 for ; Wed, 26 Feb 2025 10:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740564760; cv=none; b=nXJtZwRnJowKRlT96hOX2OZtxZ+RHIZ8bXotFFwMvan9vR/+S3M4zt28oM/u2DjTeT1HssFAZ2aQc/cvCW0xymCrFq+iPelx/1zCZJJ7y51I3veJFiZiCQVSZNRVTqnNl35jhEL8fmlP0MzxfieDT+aCorJhs+eWYZvE4bORH9A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740564760; c=relaxed/simple; bh=AOtsqlOUd+Q3nrmqeeuq8/tgBq1NpytDTQzjNybTiww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=plRYKhfggwS+/6aYiT6ZbpqM51hK6JuajqSmk6Uv8FlJNJlCiuS+Q5vU7N7L3p4g4wCuxOhltGkP7aWDWX0epaxqGUi4DC3xtV9EdPqaG/kUF2jaoPo2zSQhoalPyo/7QQ9oy0QfFOczWKmCAFs9k9Wv41BuLOJUywBt7Wyn02o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl; spf=none smtp.mailfrom=bgdev.pl; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b=ufXRY/Un; arc=none smtp.client-ip=209.85.221.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bgdev.pl Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bgdev-pl.20230601.gappssmtp.com header.i=@bgdev-pl.20230601.gappssmtp.com header.b="ufXRY/Un" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-390dd3654aeso147605f8f.2 for ; Wed, 26 Feb 2025 02:12:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20230601.gappssmtp.com; s=20230601; t=1740564757; x=1741169557; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Gf7zrHqAdgnbRAeeIHqjXUoytiZ19dAcrK1RDj790h0=; b=ufXRY/UnBPhppJT5aYf8fpuUhSmUHQT9sjD5sOWAbT8iMae54twrfJGmBuHT3Ur2Yr k56fuzhMbjuLk5+ok9Z2GnCKxSVVOw/n/c7CiEGFbvRR+vj3W+/AlejFLFaJhWC6vIhn 6J1SSsAdzECZkW+mqMIRJ9dWmE9J3cetj1L/LPtlQ7Pyfjm8AFzbZXHFGt5znNt0E62+ PqZg/4woy5R430X0p1xD1xwvQv9qZTm200ZPg8yb4nocQdJNKnCyoqswQn3lP11HNNS8 i4kgataGulv6s6WItgFwAvPO9GNYJwg7Eo1VbmVJjEOUWrnLW7rNwEvLRqzMHxVTCm1G jk8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740564757; x=1741169557; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Gf7zrHqAdgnbRAeeIHqjXUoytiZ19dAcrK1RDj790h0=; b=CZCWdoR/27+TlTz8xmjtcn7KtA/xD+QM6p6e2yu7l4kZTp6/MefNaCRpJdeb0YoBha Gm8hYrJ3k83Cusvxf+GkIT19qJImgojbytoHR7Zw5cc0coZQdKD98rpI+m5ZX42ot53U 65kK3Obt0CIWuAordlRk/nt2nYQ4v64i9aTA23orSwIa276+Lm2kia9NhavNCjCiAb++ iKioO2zpPqlfISEyDlW5lw+yMKTLb0wlmPQRJssGZ00AcXZa8YYniDGuKm9cqOBJIhy7 YrhKZiIOGHBk87mXOnzo3bbrdMi2KKS4GhePRFdejduDqDnWma4PmQLkXNJylhHjKCIH 4MdA== X-Gm-Message-State: AOJu0YzKdchhH1Hy2f8zaXfxf+IYiIN8m9Vv2qxWqLZ6vz/ghMcP/5qS cd0KicVj5fRokG6sxynGoFIBVUzewX/TgTK1ofumRZVSgMFfNvCyjc04UCixq0U= X-Gm-Gg: ASbGnctXj0oPH+uZ61P73qWwGaPBsIgfu0E/gvAoS9WZltIk197bnOZ06MWAyIiurr+ 8+lntAgd+ptR/TLuWzUWIuSqemWEJ14DXgVsgHk32ZHdBrZaTlC7r3j8eT97Ygs0wrXtKardMeV a44TyclCwV6yZBkgtAGfnHhtbkEBOEd9trozXPwjeeuLDkBnrgGzxxZJJxSFD49TLlnhGuTXM29 CVYkRiUMAJ8Idx1p3ZZt1QBQRVrnp2CXCRZreNK1gh0PWf+ofq8+uO3xE+SwuSBckl6oVs2TeHe qVOXcfxuv2AZRqul X-Google-Smtp-Source: AGHT+IGEaNiDzOSieP71Ur9Z89WNZbFkGIfzR9lLcxLKiZmPznX1O0XMm0LCjDQo7uBizOeM3s/rAg== X-Received: by 2002:a05:6000:1f82:b0:38f:2113:fba0 with SMTP id ffacd0b85a97d-390cc63cf15mr5755133f8f.50.1740564756809; Wed, 26 Feb 2025 02:12:36 -0800 (PST) Received: from [127.0.1.1] ([2a01:cb1d:dc:7e00:7d02:26:5770:658c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-390d649cd17sm1483971f8f.79.2025.02.26.02.12.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 02:12:36 -0800 (PST) From: Bartosz Golaszewski Date: Wed, 26 Feb 2025 11:12:30 +0100 Subject: [PATCH v2 2/3] gpiolib: use a more explicit retval logic in gpiochip_get_direction() Precedence: bulk X-Mailing-List: linux-gpio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250226-retval-fixes-v2-2-c8dc57182441@linaro.org> References: <20250226-retval-fixes-v2-0-c8dc57182441@linaro.org> In-Reply-To: <20250226-retval-fixes-v2-0-c8dc57182441@linaro.org> To: Linus Walleij , Bartosz Golaszewski , Marek Szyprowski , Andy Shevchenko Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski , Andy Shevchenko X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=1207; i=bartosz.golaszewski@linaro.org; h=from:subject:message-id; bh=mqJk5RX1yeclgYqC4arydwTfWo3zYHbBnoSeksuNJvk=; b=owEBbQKS/ZANAwAKARGnLqAUcddyAcsmYgBnvukRgYaEPCh7qqnfMzCFxviPlkm5aT7bVUnTR +XWoAPxKAKJAjMEAAEKAB0WIQQWnetsC8PEYBPSx58Rpy6gFHHXcgUCZ77pEQAKCRARpy6gFHHX cgRqD/9IhwDCta6+RtlkqzzyGimA0gsF8Sdeb8/gADVc2d6rgFwk5/c1NICXL81zhA6U4zjsVF8 DcKKoiW+WL/i0Vshix0yPqX5nP/pRFkyAd5vwujmRCViUuuzmKiag5aISU5+AEJGk8mltndzjBY Xu1p/oi9DVloQDygDH/UKPTcqzBx0/lWF5GR8S4tnB5W5vWzq3JOyX86H90F63BuLOl5Qk6YPJa Z1H15WJXbrPipUf1cuVlNP5VSrpMNgFFndUg9CLbS6++WCwmr+ExMcM3TUzw5TQXPheGadcqoh+ 2CFhshj6e2atxYB1UVt+HzykZsb/f0Nfv8AITpgWroa/xmM+0gxG3XcpkrKZsWShKmpptxtM1Ja snCIrRVHlHXL6tt49NgFMQSzNKj3cDDr+57Lel2sUChD5wvwgpPReXH86jRk/PAi6+f/1al5PHL dWVGLfzjRBPJ2Rw3SaoVc5ZTMcGmp8s52v8q8mJVibd9p2XUkD1Ijue5yqc7eiGYnFprwIZlvaH to818oa3445E3pwR452lDP+qNLpaRQv+ZJHvg+bJWRcoji9XZCyVgjj6lvXTgEkMxvYEt+kuxNK igGKicPIWU+s3dJwdUOpwf/naSnfhVP1MN2ZO7f/Tx0ZAJaj7/TI62MnA24MFp654dYBirR2fe+ MrEh95t9BZnBayw== X-Developer-Key: i=bartosz.golaszewski@linaro.org; a=openpgp; fpr=169DEB6C0BC3C46013D2C79F11A72EA01471D772 From: Bartosz Golaszewski We have existing macros for direction settings so we don't need to rely on the magic value of 1 in the retval check. Use readable logic that explicitly says we expect INPUT, OUTPUT or a negative errno and nothing else in gpiochip_get_direction(). Fixes: e623c4303ed1 ("gpiolib: sanitize the return value of gpio_chip::get_direction()") Suggested-by: Andy Shevchenko Closes: https://lore.kernel.org/all/Z7yfTggRrk3K6srs@black.fi.intel.com/ Reviewed-by: Andy Shevchenko Signed-off-by: Bartosz Golaszewski --- drivers/gpio/gpiolib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 0d325cc41af3..6f4efab237e6 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -352,7 +352,10 @@ static int gpiochip_get_direction(struct gpio_chip *gc, unsigned int offset) return -EOPNOTSUPP; ret = gc->get_direction(gc, offset); - if (ret > 1) + if (ret < 0) + return ret; + + if (ret != GPIO_LINE_DIRECTION_OUT && ret != GPIO_LINE_DIRECTION_IN) ret = -EBADE; return ret;