Unverified Commit 57a94f68 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9687 greybus: lights: check return of get_channel_from_mode 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CBRHI5ND6XDCGG2L5MQMI73RRSGMT43B/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA7D18 
 
Link:https://gitee.com/openeuler/kernel/pulls/9687

 

Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents cab2e4e9 f5eaf532

drivers/staging/greybus/light.c

+7 −1
Original line number Diff line number Diff line
@@ -147,6 +147,9 @@ static int __gb_lights_flash_brightness_set(struct gb_channel *channel) 
		channel = get_channel_from_mode(channel->light,

						GB_CHANNEL_MODE_TORCH);



	if (!channel)

		return -EINVAL;



	/* For not flash we need to convert brightness to intensity */

	intensity = channel->intensity_uA.min +

			(channel->intensity_uA.step * channel->led->brightness);
@@ -549,7 +552,10 @@ static int gb_lights_light_v4l2_register(struct gb_light *light) 
	}



	channel_flash = get_channel_from_mode(light, GB_CHANNEL_MODE_FLASH);

	WARN_ON(!channel_flash);

	if (!channel_flash) {

		dev_err(dev, "failed to get flash channel from mode\n");

		return -EINVAL;

	}



	fled = &channel_flash->fled;