Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
drivers
/
input
/
touchscreen
/
sur40.c
diff --git
a/kernel/drivers/input/touchscreen/sur40.c
b/kernel/drivers/input/touchscreen/sur40.c
index
d214f22
..
45b466e
100644
(file)
--- a/
kernel/drivers/input/touchscreen/sur40.c
+++ b/
kernel/drivers/input/touchscreen/sur40.c
@@
-126,7
+126,7
@@
struct sur40_image_header {
#define VIDEO_PACKET_SIZE 16384
/* polling interval (ms) */
#define VIDEO_PACKET_SIZE 16384
/* polling interval (ms) */
-#define POLL_INTERVAL
4
+#define POLL_INTERVAL
1
/* maximum number of contacts FIXME: this is a guess? */
#define MAX_CONTACTS 64
/* maximum number of contacts FIXME: this is a guess? */
#define MAX_CONTACTS 64
@@
-441,7
+441,7
@@
static void sur40_process_video(struct sur40_state *sur40)
/* return error if streaming was stopped in the meantime */
if (sur40->sequence == -1)
/* return error if streaming was stopped in the meantime */
if (sur40->sequence == -1)
-
goto err_poll
;
+
return
;
/* mark as finished */
v4l2_get_timestamp(&new_buf->vb.timestamp);
/* mark as finished */
v4l2_get_timestamp(&new_buf->vb.timestamp);
@@
-730,6
+730,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);
static void sur40_stop_streaming(struct vb2_queue *vq)
{
struct sur40_state *sur40 = vb2_get_drv_priv(vq);
+ vb2_wait_for_all_buffers(vq);
sur40->sequence = -1;
/* Release all active buffers */
sur40->sequence = -1;
/* Release all active buffers */