summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-04-17 02:47:21 -0300
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:59:06 +0900
commit00c808b1abdd656b7b2ae2f6ea6e25f1abaa702d (patch)
tree64d949cc3b9dc85089111782911336c772da3dab /include
parentebcad5645f16ada435615f12c885d749adf881c4 (diff)
downloadlinux-3.10-00c808b1abdd656b7b2ae2f6ea6e25f1abaa702d.tar.gz
linux-3.10-00c808b1abdd656b7b2ae2f6ea6e25f1abaa702d.tar.bz2
linux-3.10-00c808b1abdd656b7b2ae2f6ea6e25f1abaa702d.zip
upstream: [media] vb2: stop_streaming should return void
The vb2 core ignores any return code from the stop_streaming op. And there really isn't anything it can do anyway in case of an error. So change the return type to void and update any drivers that implement it. The int return gave drivers the idea that this operation could actually fail, but that's really not the case. The pwc amd sdr-msi3101 drivers both had this construction: if (mutex_lock_interruptible(&s->v4l2_lock)) return -ERESTARTSYS; This has been updated to just call mutex_lock(). The stop_streaming op expects this to really stop streaming and I very much doubt this will work reliably if stop_streaming just returns without really stopping the DMA. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Acked-by: Pawel Osciak <pawel@osciak.com> Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com> Conflicts: Documentation/video4linux/v4l2-pci-skeleton.c drivers/staging/media/msi3101/sdr-msi3101.c
Diffstat (limited to 'include')
-rw-r--r--include/media/videobuf2-core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 635cb495fdd..861d8e06237 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -324,7 +324,7 @@ struct vb2_ops {
void (*buf_cleanup)(struct vb2_buffer *vb);
int (*start_streaming)(struct vb2_queue *q, unsigned int count);
- int (*stop_streaming)(struct vb2_queue *q);
+ void (*stop_streaming)(struct vb2_queue *q);
void (*buf_queue)(struct vb2_buffer *vb);
};