tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[media] SoC Camera: OMAP1: update for recent videobuf changes

Recent locking related videobuf changes has not been incorporated into the new
OMAP1 camera driver. Fix it.

Created and tested against linux-2.6.37-rc1.

Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

authored by Janusz Krzysztofik and committed by Mauro Carvalho Chehab 8c66caeb 352f5d25

+3 -3
unified split
+3 -3
drivers/media/video/omap1_camera.c
··· 235 236 BUG_ON(in_interrupt()); 237 238 - videobuf_waiton(vb, 0, 0); 239 240 if (vb_mode == OMAP1_CAM_DMA_CONTIG) { 241 videobuf_dma_contig_free(vq, vb); ··· 1365 videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops, 1366 icd->dev.parent, &pcdev->lock, 1367 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, 1368 - sizeof(struct omap1_cam_buf), icd); 1369 else 1370 videobuf_queue_sg_init(q, &omap1_videobuf_ops, 1371 icd->dev.parent, &pcdev->lock, 1372 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, 1373 - sizeof(struct omap1_cam_buf), icd); 1374 1375 /* use videobuf mode (auto)selected with the module parameter */ 1376 pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;
··· 235 236 BUG_ON(in_interrupt()); 237 238 + videobuf_waiton(vq, vb, 0, 0); 239 240 if (vb_mode == OMAP1_CAM_DMA_CONTIG) { 241 videobuf_dma_contig_free(vq, vb); ··· 1365 videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops, 1366 icd->dev.parent, &pcdev->lock, 1367 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, 1368 + sizeof(struct omap1_cam_buf), icd, NULL); 1369 else 1370 videobuf_queue_sg_init(q, &omap1_videobuf_ops, 1371 icd->dev.parent, &pcdev->lock, 1372 V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, 1373 + sizeof(struct omap1_cam_buf), icd, NULL); 1374 1375 /* use videobuf mode (auto)selected with the module parameter */ 1376 pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;