From adb85f9562031ceaec5717b2c716b847c95149ba Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sat, 25 Dec 2010 07:04:16 -0300 Subject: [PATCH] --- yaml --- r: 226335 b: refs/heads/master c: 41d9931c5ae014fbab8bf612c70b8e7ff16f4641 h: refs/heads/master i: 226333: 3ffef6a72d87a66facb7021491f6b772e336a583 226331: de67a34aa8d67bacfdaa2f1398e67c21597ca0af 226327: 1483f3126fbaac6209875bb3a3ae1b2f4a0a5abf 226319: d918d3014e00561c55c4bdbb80813c75f0e44d60 226303: ef7f6b3136573a35c6e17a0c3d6efe66c1e3068b v: v3 --- [refs] | 2 +- trunk/drivers/media/video/videobuf-dma-sg.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 71d999529431..54f9381996c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad1ecf8639e51ab8066cd4f37fd36b6b7cbdd8b3 +refs/heads/master: 41d9931c5ae014fbab8bf612c70b8e7ff16f4641 diff --git a/trunk/drivers/media/video/videobuf-dma-sg.c b/trunk/drivers/media/video/videobuf-dma-sg.c index 9d520601c70f..ddb8f4b46c03 100644 --- a/trunk/drivers/media/video/videobuf-dma-sg.c +++ b/trunk/drivers/media/video/videobuf-dma-sg.c @@ -543,14 +543,6 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, retval = -EINVAL; - /* This function maintains backwards compatibility with V4L1 and will - * map more than one buffer if the vma length is equal to the combined - * size of multiple buffers than it will map them together. See - * VIDIOCGMBUF in the v4l spec - * - * TODO: Allow drivers to specify if they support this mode - */ - BUG_ON(!mem); MAGIC_CHECK(mem->magic, MAGIC_SG_MEM);