From nobody Sun Feb 8 21:14:00 2026 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 C7318237B7A; Sun, 24 Mar 2024 23:18:35 +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=1711322316; cv=none; b=snw/V3LvFVG2aGN1TAgxA/9JAjbc2yaUnSID0heIEeWozH4TZ6pobzN6PR39C2pU9iIaioNBSYyumE4/5uGG8Par9QdCHK1AGjCQ9bdv030u8J212Zm9HRWHIIHl3+fX0hVFC+2yTT+HbPJsXl6tYCPT3QNsRNjiK8KHADX09Nk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322316; c=relaxed/simple; bh=8ZKUgi6Zm68D4WzC4t+cU2OxTpDWbRbA9/z+ZTeTjWQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JsJvoJcv6ZFIOvoWHS8UCX6nTpgOKQ9JnYHILVVz9SXv/6kq/ei19pVGVLxUFGgzDqkdWDfIi8vsaTZyvgp+B8eeBi+CMFdaMhBRs5OxSzLj6qjW4Xxac/Ikg+4geK5AOn3EByzt5L6AF2oW/nr/zwV+9WPmn4CE7VjlzZ0wbzY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pewN/9CY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pewN/9CY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA7B5C43399; Sun, 24 Mar 2024 23:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322315; bh=8ZKUgi6Zm68D4WzC4t+cU2OxTpDWbRbA9/z+ZTeTjWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pewN/9CYLxpD93shOidL3wqjw3uzBt4KlUEpPthK0MYiodPef98j5aadVV7zC1NwG SHO3qZnwjYkck/Y4NjdsbMU7dqfoa8HrsTrBuMz0+hCeqyOT9cTYYAQwSr8aItjFg4 q2ic4QjJG2qw2HoTBn5jFUolGBg/Sm0rxKTUXP9uyDWjHfQ2eve9rLXHG1eENVVqyH 06a7hI3mDH7+HKVuFSLawY//eJMnYGhXouOEJZCgdZUSy/nBbmrGUs00JGfhxoX0sn itd8sRfm1SY8u/WJLSNQ/2DAtYzW93IVG941/+kmZEhcGXXJClrgCgdON3NttMVIjO KRbt4y2zJi8Ew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Rui Miguel Silva , Alex Elder , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1 398/451] staging: greybus: fix get_channel_from_mode() failure path Date: Sun, 24 Mar 2024 19:11:14 -0400 Message-ID: <20240324231207.1351418-399-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Dan Carpenter [ Upstream commit 34164202a5827f60a203ca9acaf2d9f7d432aac8 ] The get_channel_from_mode() function is supposed to return the channel which matches the mode. But it has a bug where if it doesn't find a matching channel then it returns the last channel. It should return NULL instead. Also remove an unnecessary NULL check on "channel". Fixes: 2870b52bae4c ("greybus: lights: add lights implementation") Signed-off-by: Dan Carpenter Reviewed-by: Rui Miguel Silva Reviewed-by: Alex Elder Link: https://lore.kernel.org/r/379c0cb4-39e0-4293-8a18-c7b1298e5420@moroto= .mountain Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/greybus/light.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/ligh= t.c index 87d36948c6106..c6bd86a5335ab 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -100,15 +100,15 @@ static struct led_classdev *get_channel_cdev(struct g= b_channel *channel) static struct gb_channel *get_channel_from_mode(struct gb_light *light, u32 mode) { - struct gb_channel *channel =3D NULL; + struct gb_channel *channel; int i; =20 for (i =3D 0; i < light->channels_count; i++) { channel =3D &light->channels[i]; - if (channel && channel->mode =3D=3D mode) - break; + if (channel->mode =3D=3D mode) + return channel; } - return channel; + return NULL; } =20 static int __gb_lights_flash_intensity_set(struct gb_channel *channel, --=20 2.43.0