diff options
| author |   Florian Echtler <floe@butterbrot.org> | 2015-05-25 09:04:16 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-05-30 11:45:00 -0300 |
| commit | 2b7eea83a4e694018ddc155078bc36bf702ea466 (patch) | |
| tree | 9d37051e1546a50902d9f22312b0ca2e35d00be8 /drivers/input/touchscreen/sur40.c | |
| parent | [media] add extra debug output, remove noisy warning (diff) | |
| download | linux-dev-2b7eea83a4e694018ddc155078bc36bf702ea466.tar.xz linux-dev-2b7eea83a4e694018ddc155078bc36bf702ea466.zip | |
[media] return BUF_STATE_ERROR if streaming stopped during acquisition
When stop_streaming is called while a frame is currently being retrieved, the
buffer being filled will still be returned with BUF_STATE_DONE. By resetting
the sequence number and checking before returning the buffer, it can now
correctly be returned with BUF_STATE_ERROR.
Signed-off-by: Martin Kaltenbrunner <modin@yuri.at>
Signed-off-by: Florian Echtler <floe@butterbrot.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/input/touchscreen/sur40.c')
| -rw-r--r-- | drivers/input/touchscreen/sur40.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c index 8add986abc82..8be7b9b79f20 100644 --- a/drivers/input/touchscreen/sur40.c +++ b/drivers/input/touchscreen/sur40.c @@ -438,6 +438,10 @@ static void sur40_process_video(struct sur40_state *sur40) dev_dbg(sur40->dev, "image acquired\n"); + /* return error if streaming was stopped in the meantime */ + if (sur40->sequence == -1) + goto err_poll; + /* mark as finished */ v4l2_get_timestamp(&new_buf->vb.v4l2_buf.timestamp); new_buf->vb.v4l2_buf.sequence = sur40->sequence++; @@ -723,6 +727,7 @@ static int sur40_start_streaming(struct vb2_queue *vq, unsigned int count) static void sur40_stop_streaming(struct vb2_queue *vq) { struct sur40_state *sur40 = vb2_get_drv_priv(vq); + sur40->sequence = -1; /* Release all active buffers */ return_all_buffers(sur40, VB2_BUF_STATE_ERROR); |