From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 2BD29332EA7; Sat, 30 May 2026 17:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161473; cv=none; b=J7O9B22GDLP673wZ13NDafgUFRvHPO9n7YMrMuDKCahzPdnYaarnEc2WpvvfObMKx2j6MsBlbg71ICj5Jj/037shz3LCgC4+ZIiMjLWEw84JfC+TG/xiOn2YbpqGm3STVMymyGljC6SdLDuFOo+oP1TPqqFvJZY4LtFuLwmqHN0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780161473; c=relaxed/simple; bh=fO5S0mf3aHDoGqzwgDRmCAtBOIqO0PfQha/fB7Tliyc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AtRhwvOTKN6PH1ZM9Ok+d7mCdpkAQJXwO9xaWlgy+OHN5LTXLYw5mypmPgEy1KdoJFpAI0HYntljbN4hZlVm+C8FhFFvJHzQ++huO4bmyiUqUzTAz+rIgHwkU0slN9RiF6bnAeAieyIEXpcKUUK1BaoibaG7IGPb3lC+gIAForU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=FUp+EvLH; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FUp+EvLH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28BD11F00893; Sat, 30 May 2026 17:17:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780161471; bh=J4b12Q7nw8mkn5senZoHSaGQ2jJ4g5RKzsOQMIboax0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FUp+EvLHvQeP5z6+zPyVMfB7ToHeOTYz5Ko5D++HujCeyDUL2UxrzR8LrmsIcFWhB T8rqhc3xQSX3qZCrygl2FVP+/4tsyxJSYqSK23XZYyEoqU6BXDPVl+0gUBhcknsA1c ZcLQiS3gl3iLSB6vC7kmfuOz6pRwS2vQCxx9QVXI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chen Ni , Linus Walleij , Miquel Raynal , Sasha Levin Subject: [PATCH 6.1 603/969] mtd: physmap_of_gemini: Fix disabled pinctrl state check Date: Sat, 30 May 2026 18:02:07 +0200 Message-ID: <20260530160317.077471809@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Chen Ni [ Upstream commit b7c0982184b0661f5b1b805f3a56f1bd3757b63e ] The condition for checking the disabled pinctrl state incorrectly checks gf->enabled_state instead of gf->disabled_state. This causes misleading error messages and could lead to incorrect behavior when only one of the pinctrl states is defined. Fix the condition to properly check gf->disabled_state. Fixes: 9d3b5086f6d4 ("mtd: physmap_of_gemini: Handle pin control") Signed-off-by: Chen Ni Reviewed-by: Linus Walleij Signed-off-by: Miquel Raynal Signed-off-by: Sasha Levin --- drivers/mtd/maps/physmap-gemini.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mtd/maps/physmap-gemini.c b/drivers/mtd/maps/physmap-gemini.c index d4a46e159d38f..8d5b791dd08d4 100644 --- a/drivers/mtd/maps/physmap-gemini.c +++ b/drivers/mtd/maps/physmap-gemini.c @@ -181,7 +181,7 @@ int of_flash_probe_gemini(struct platform_device *pdev, dev_err(dev, "no enabled pin control state\n"); gf->disabled_state = pinctrl_lookup_state(gf->p, "disabled"); - if (IS_ERR(gf->enabled_state)) { + if (IS_ERR(gf->disabled_state)) { dev_err(dev, "no disabled pin control state\n"); } else { ret = pinctrl_select_state(gf->p, gf->disabled_state); -- 2.53.0