Merge tag 'staging-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[sfrench/cifs-2.6.git] / drivers / staging / greybus / light.c

diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index d62f97249aca678886f064d4b8f7cf3304f6afa2..a5c2fe963866db66a487eaa824d53329ffc0c080 100644 (file)
--- 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,