kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[media] V4L: fix a confusing function name

Browse source 
is_state_active_or_queued() actually returns true if the buffer's state
is neither active nore queued. Rename it for clarity.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Guennadi Liakhovetski 2016-02-21 13:34:59 -03:00 committed by Mauro Carvalho Chehab
parent 0724745fae
commit 5eba1726e1
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/media/v4l2-core/videobuf-core.c
View file

@ -75,7 +75,8 @@ struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q)
}
EXPORT_SYMBOL_GPL(videobuf_alloc_vb);
static int is_state_active_or_queued(struct videobuf_queue *q, struct videobuf_buffer *vb)
static int state_neither_active_nor_queued(struct videobuf_queue *q,
struct videobuf_buffer *vb)
{
unsigned long flags;
bool rc;
@ -95,7 +96,7 @@ int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb,
MAGIC_CHECK(vb->magic, MAGIC_BUFFER);
if (non_blocking) {
if (is_state_active_or_queued(q, vb))
if (state_neither_active_nor_queued(q, vb))
return 0;
return -EAGAIN;
}
@ -107,9 +108,10 @@ int videobuf_waiton(struct videobuf_queue *q, struct videobuf_buffer *vb,
if (is_ext_locked)
mutex_unlock(q->ext_lock);
if (intr)
ret = wait_event_interruptible(vb->done, is_state_active_or_queued(q, vb));
ret = wait_event_interruptible(vb->done,
state_neither_active_nor_queued(q, vb));
else
wait_event(vb->done, is_state_active_or_queued(q, vb));
wait_event(vb->done, state_neither_active_nor_queued(q, vb));
/* Relock */
if (is_ext_locked)
mutex_lock(q->ext_lock);