summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/vsp1/vsp1_entity.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2015-11-01 12:58:29 -0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-04-13 17:42:45 -0300
commit59d0b2bf1d8de62d3ee8cce5c5b9463608095642 (patch)
tree365f679b2a3428ffb326a97ae04dba333eed1c2f /drivers/media/platform/vsp1/vsp1_entity.c
parentd884a8b2a5dc2fad784a60f356d1d8d90cecb436 (diff)
downloadtalos-op-linux-59d0b2bf1d8de62d3ee8cce5c5b9463608095642.tar.gz
talos-op-linux-59d0b2bf1d8de62d3ee8cce5c5b9463608095642.zip
[media] v4l: vsp1: Don't setup control handler when starting streaming
The control handler set operations don't program the hardware anymore, there's thus no need to call them when starting the stream. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/platform/vsp1/vsp1_entity.c')
-rw-r--r--drivers/media/platform/vsp1/vsp1_entity.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
index a94f544dcc77..6b425ae9aba3 100644
--- a/drivers/media/platform/vsp1/vsp1_entity.c
+++ b/drivers/media/platform/vsp1/vsp1_entity.c
@@ -45,29 +45,13 @@ bool vsp1_entity_is_streaming(struct vsp1_entity *entity)
return streaming;
}
-int vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
+void vsp1_entity_set_streaming(struct vsp1_entity *entity, bool streaming)
{
unsigned long flags;
- int ret;
spin_lock_irqsave(&entity->lock, flags);
entity->streaming = streaming;
spin_unlock_irqrestore(&entity->lock, flags);
-
- if (!streaming)
- return 0;
-
- if (!entity->vsp1->info->uapi || !entity->subdev.ctrl_handler)
- return 0;
-
- ret = v4l2_ctrl_handler_setup(entity->subdev.ctrl_handler);
- if (ret < 0) {
- spin_lock_irqsave(&entity->lock, flags);
- entity->streaming = false;
- spin_unlock_irqrestore(&entity->lock, flags);
- }
-
- return ret;
}
void vsp1_entity_route_setup(struct vsp1_entity *source)
OpenPOWER on IntegriCloud