[media] vb2: fix vb2 state check when start_streaming fails
authorHans Verkuil <hans.verkuil@cisco.com>
Mon, 4 Aug 2014 10:14:14 +0000 (07:14 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sun, 21 Sep 2014 23:46:10 +0000 (20:46 -0300)
commitbf3593d939520559774cbfee03ba5f314d909620
treea8c9fde479be353b28f458095cd1d3934e8b7b1c
parent44e8e69d46db9928cd3b81cbea4ca24257412286
[media] vb2: fix vb2 state check when start_streaming fails

Commit bd994ddb2a12a3ff48cd549ec82cdceaea9614df (vb2: Fix stream start and
buffer completion race) broke the buffer state check in vb2_buffer_done.

So accept all three possible states there since I can no longer tell the
difference between vb2_buffer_done called from start_streaming or from
elsewhere.

Instead add a WARN_ON at the end of start_streaming that will check whether
any buffers were added to the done list, since that implies that the wrong
state was used as well.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: stable@vger.kernel.org # for v3.15 and up
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/v4l2-core/videobuf2-core.c