* [PATCH] staging: greybus: fix get_channel_from_mode() failure path
@ 2024-03-04 7:04 Dan Carpenter
2024-03-04 9:17 ` Rui Miguel Silva
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2024-03-04 7:04 UTC (permalink / raw)
To: Rui Miguel Silva
Cc: Johan Hovold, Alex Elder, Greg Kroah-Hartman, greybus-dev,
linux-staging, linux-kernel, kernel-janitors
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>
---
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/light.c
index d62f97249aca..a5c2fe963866 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -95,15 +95,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,
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: greybus: fix get_channel_from_mode() failure path
2024-03-04 7:04 [PATCH] staging: greybus: fix get_channel_from_mode() failure path Dan Carpenter
@ 2024-03-04 9:17 ` Rui Miguel Silva
2024-03-04 17:49 ` Alex Elder
0 siblings, 1 reply; 3+ messages in thread
From: Rui Miguel Silva @ 2024-03-04 9:17 UTC (permalink / raw)
To: Dan Carpenter
Cc: Johan Hovold, Alex Elder, Greg Kroah-Hartman, greybus-dev,
linux-staging, linux-kernel, kernel-janitors
Hi Dan,
once again thanks for the patch.
Dan Carpenter <dan.carpenter@linaro.org> writes:
> 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>
Cheers,
Rui
> ---
> 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/light.c
> index d62f97249aca..a5c2fe963866 100644
> --- a/drivers/staging/greybus/light.c
> +++ b/drivers/staging/greybus/light.c
> @@ -95,15 +95,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,
> --
> 2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] staging: greybus: fix get_channel_from_mode() failure path
2024-03-04 9:17 ` Rui Miguel Silva
@ 2024-03-04 17:49 ` Alex Elder
0 siblings, 0 replies; 3+ messages in thread
From: Alex Elder @ 2024-03-04 17:49 UTC (permalink / raw)
To: Rui Miguel Silva, Dan Carpenter
Cc: Johan Hovold, Alex Elder, Greg Kroah-Hartman, greybus-dev,
linux-staging, linux-kernel, kernel-janitors
On 3/4/24 3:17 AM, Rui Miguel Silva wrote:
> Hi Dan,
> once again thanks for the patch.
>
> Dan Carpenter <dan.carpenter@linaro.org> writes:
>
>> 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>
Looks good.
Reviewed-by: Alex Elder <elder@linaro.org>
>
> Cheers,
> Rui
>
>> ---
>> 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/light.c
>> index d62f97249aca..a5c2fe963866 100644
>> --- a/drivers/staging/greybus/light.c
>> +++ b/drivers/staging/greybus/light.c
>> @@ -95,15 +95,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,
>> --
>> 2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-04 17:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-04 7:04 [PATCH] staging: greybus: fix get_channel_from_mode() failure path Dan Carpenter
2024-03-04 9:17 ` Rui Miguel Silva
2024-03-04 17:49 ` Alex Elder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).