diff options
| author | Dan Carpenter <dan.carpenter@linaro.org> | 2024-03-04 10:04:48 +0300 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2024-03-26 18:22:42 -0400 |
| commit | 40bbb7e4e83a53b5ae2c4b79c675618159571d83 (patch) | |
| tree | 060fcea5739c15137bc5df7d37f303c7ab6d3a9f | |
| parent | 787e2620d1574196f10193a7c3693d95958254cb (diff) | |
| download | linux-stable-40bbb7e4e83a53b5ae2c4b79c675618159571d83.tar.gz linux-stable-40bbb7e4e83a53b5ae2c4b79c675618159571d83.tar.bz2 linux-stable-40bbb7e4e83a53b5ae2c4b79c675618159571d83.zip | |
staging: greybus: fix get_channel_from_mode() failure path
[ 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 <dan.carpenter@linaro.org>
Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Link: https://lore.kernel.org/r/379c0cb4-39e0-4293-8a18-c7b1298e5420@moroto.mountain
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/staging/greybus/light.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c index db06cd544af5..8c5819d1e1ab 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c @@ -102,15 +102,15 @@ static struct led_classdev *get_channel_cdev(struct gb_channel *channel) static struct gb_channel *get_channel_from_mode(struct gb_light *light, u32 mode) { - struct gb_channel *channel = NULL; + struct gb_channel *channel; int i; for (i = 0; i < light->channels_count; i++) { channel = &light->channels[i]; - if (channel && channel->mode == mode) - break; + if (channel->mode == mode) + return channel; } - return channel; + return NULL; } static int __gb_lights_flash_intensity_set(struct gb_channel *channel, |