From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 04590398919 for ; Tue, 7 Apr 2026 15:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575607; cv=none; b=WG1sINv5+vgW5fn2qGuCeuHConnqIOlahWgirHCu5NsxoKiG40wqiPGSfZxLKd2Fi/tSrrmj9qk7rqn6OGktTdPl6anATB9Gc/XTzqr0RvizN0IS567Jfz0sd3C7Aj9vBTZ24+mmBD9O78eB1QO6CUZBd2ZLcUFr0ln2tBgqegc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775575607; c=relaxed/simple; bh=9tC37yGL9CqIRdMExLbh9ezXINJgiSvhzYgZ1u4Ais0=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=WbGtmvz+GKqm2uLzFpLkHMn9aNTcZIEfo1Pco6ylkzRCnOI/EcgYCrTRLaHAxHVIgc1ILiydNcGXETMeat4kNPHfbDktwV30Fraode1y0V9/WyGTPvmMwPaLV2XHoLIgp/obVyajdF7F3BAOXcREuxDYqyzCgTt8buDoIKlV2fU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gt24xu9O; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gt24xu9O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4BA31C116C6; Tue, 7 Apr 2026 15:26:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775575605; bh=9tC37yGL9CqIRdMExLbh9ezXINJgiSvhzYgZ1u4Ais0=; h=Subject:To:Cc:From:Date:From; b=gt24xu9OWMgjvRFLA/Un1hESPp+5K1Qx9K0vK2rQqMw//KTGUKmhPVBE/T+ufzsJR XnMWpXkj7DXE701AAFQxhkLB46MdQjA3XVb6hqUFRMiSFyJVamUNNlvV08o9+BQnyZ 4r8vUCIohasBY/JoskGi8hs4oQQx8m6vF02rSL5Y= Subject: FAILED: patch "[PATCH] iio: adc: ti-ads7950: do not clobber gpio state in" failed to apply to 6.1-stable tree To: dmitry.torokhov@gmail.com,Jonathan.Cameron@huawei.com,Stable@vger.kernel.org,dlechner@baylibre.com Cc: From: Date: Tue, 07 Apr 2026 17:22:51 +0200 Message-ID: <2026040751-cornstalk-hacking-02be@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x d20bbae6e5d408a8a7c2a4344d76dd1ac557a149 # git commit -s git send-email --to '' --in-reply-to '2026040751-cornstalk-hacking-02be@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d20bbae6e5d408a8a7c2a4344d76dd1ac557a149 Mon Sep 17 00:00:00 2001 From: Dmitry Torokhov Date: Thu, 5 Mar 2026 11:21:53 -0800 Subject: [PATCH] iio: adc: ti-ads7950: do not clobber gpio state in ti_ads7950_get() GPIO state was inadvertently overwritten by the result of spi_sync(), resulting in ti_ads7950_get() only returning 0 as GPIO state (or error). Fix this by introducing a separate variable to hold the state. Fixes: c97dce792dc8 ("iio: adc: ti-ads7950: add GPIO support") Reported-by: David Lechner Signed-off-by: Dmitry Torokhov Cc: Signed-off-by: Jonathan Cameron diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c index b8cc39fc39fb..cdc624889559 100644 --- a/drivers/iio/adc/ti-ads7950.c +++ b/drivers/iio/adc/ti-ads7950.c @@ -427,13 +427,15 @@ static int ti_ads7950_set(struct gpio_chip *chip, unsigned int offset, static int ti_ads7950_get(struct gpio_chip *chip, unsigned int offset) { struct ti_ads7950_state *st = gpiochip_get_data(chip); + bool state; int ret; mutex_lock(&st->slock); /* If set as output, return the output */ if (st->gpio_cmd_settings_bitmask & BIT(offset)) { - ret = (st->cmd_settings_bitmask & BIT(offset)) ? 1 : 0; + state = st->cmd_settings_bitmask & BIT(offset); + ret = 0; goto out; } @@ -444,7 +446,7 @@ static int ti_ads7950_get(struct gpio_chip *chip, unsigned int offset) if (ret) goto out; - ret = ((st->single_rx >> 12) & BIT(offset)) ? 1 : 0; + state = (st->single_rx >> 12) & BIT(offset); /* Revert back to original settings */ st->cmd_settings_bitmask &= ~TI_ADS7950_CR_GPIO_DATA; @@ -456,7 +458,7 @@ static int ti_ads7950_get(struct gpio_chip *chip, unsigned int offset) out: mutex_unlock(&st->slock); - return ret; + return ret ?: state; } static int ti_ads7950_get_direction(struct gpio_chip *chip,