mirror of
git://git.yoctoproject.org/linux-yocto.git
synced 2025-07-06 22:05:22 +02:00
media: v4l: Don't turn on privacy LED if streamon fails
Turn on the privacy LED only if streamon succeeds. This can be done after
enabling streaming on the sensor.
Fixes: b6e10ff6c2
("media: v4l2-core: Make the v4l2-core code enable/disable the privacy LED if present")
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
This commit is contained in:
parent
ad79c9ecea
commit
f2bf6cd8f4
|
@ -442,15 +442,6 @@ static int call_s_stream(struct v4l2_subdev *sd, int enable)
|
||||||
if (WARN_ON(!!sd->enabled_streams == !!enable))
|
if (WARN_ON(!!sd->enabled_streams == !!enable))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#if IS_REACHABLE(CONFIG_LEDS_CLASS)
|
|
||||||
if (!IS_ERR_OR_NULL(sd->privacy_led)) {
|
|
||||||
if (enable)
|
|
||||||
led_set_brightness(sd->privacy_led,
|
|
||||||
sd->privacy_led->max_brightness);
|
|
||||||
else
|
|
||||||
led_set_brightness(sd->privacy_led, 0);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
ret = sd->ops->video->s_stream(sd, enable);
|
ret = sd->ops->video->s_stream(sd, enable);
|
||||||
|
|
||||||
if (!enable && ret < 0) {
|
if (!enable && ret < 0) {
|
||||||
|
@ -458,9 +449,20 @@ static int call_s_stream(struct v4l2_subdev *sd, int enable)
|
||||||
ret = 0;
|
ret = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ret)
|
if (!ret) {
|
||||||
sd->enabled_streams = enable ? BIT(0) : 0;
|
sd->enabled_streams = enable ? BIT(0) : 0;
|
||||||
|
|
||||||
|
#if IS_REACHABLE(CONFIG_LEDS_CLASS)
|
||||||
|
if (!IS_ERR_OR_NULL(sd->privacy_led)) {
|
||||||
|
if (enable)
|
||||||
|
led_set_brightness(sd->privacy_led,
|
||||||
|
sd->privacy_led->max_brightness);
|
||||||
|
else
|
||||||
|
led_set_brightness(sd->privacy_led, 0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user