Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / davinci / vpfe_capture.c

diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index 7333a9bb2549deeffc8b122d16406a6308f4b812..353eadaa823e72aa87ff3412bb1f0b8fbd05841e 100644 (file)
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -1276,7 +1276,7 @@ static int vpfe_videobuf_prepare(struct videobuf_queue *vq,
                vb->size = vpfe_dev->fmt.fmt.pix.sizeimage;
                vb->field = field;
 
-               ret = videobuf_iolock(vq, vb, NULL);;
+               ret = videobuf_iolock(vq, vb, NULL);
                if (ret < 0)
                        return ret;