diff options
authorLinus Torvalds <>2016-05-13 09:34:59 -0700
committerLinus Torvalds <>2016-05-13 09:34:59 -0700
commit90fa7c7fa38730f918c950ecf05120f223718b89 (patch)
parent9dcf8a58c702e8b25a84baf0882dc6492002831e (diff)
parent93f0750dcdaed083d6209b01e952e98ca730db66 (diff)
Merge tag 'media/v4.6-6' of git://
Pull media fix from Mauro Carvalho Chehab: "A revert fixing a breakage that caused an OOPS on all VB2-based DVB drivers. We already have a proper fix, but it sounds safer to keep it being tested for a while and not hurry, to avoid the risk of another regression, specially since this is meant to be c/c to stable. So, for now, let's just revert the broken patch" * tag 'media/v4.6-6' of git:// Revert "[media] videobuf2-v4l2: Verify planes array in buffer dequeueing"
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
index 7f366f1b0377..0b1b8c7b6ce5 100644
--- a/drivers/media/v4l2-core/videobuf2-v4l2.c
+++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
@@ -74,11 +74,6 @@ static int __verify_planes_array(struct vb2_buffer *vb, const struct v4l2_buffer
return 0;
-static int __verify_planes_array_core(struct vb2_buffer *vb, const void *pb)
- return __verify_planes_array(vb, pb);
* __verify_length() - Verify that the bytesused value for each plane fits in
* the plane length and that the data offset doesn't exceed the bytesused value.
@@ -442,7 +437,6 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb,
static const struct vb2_buf_ops v4l2_buf_ops = {
- .verify_planes_array = __verify_planes_array_core,
.fill_user_buffer = __fill_v4l2_buffer,
.fill_vb2_buffer = __fill_vb2_buffer,
.copy_timestamp = __copy_timestamp,