From patchwork Tue Nov 2 15:22:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 4780 Return-path: Envelope-to: mchehab@gaivota Delivery-date: Tue, 02 Nov 2010 11:27:11 -0400 Received: from mchehab by gaivota with local (Exim 4.72) (envelope-from ) id 1PDIlT-0003NR-8X for mchehab@gaivota; Tue, 02 Nov 2010 11:27:11 -0400 Received: from casper.infradead.org [85.118.1.10] by gaivota with IMAP (fetchmail-6.3.17) for (single-drop); Tue, 02 Nov 2010 11:27:11 -0400 (EDT) Received: from vger.kernel.org ([209.132.180.67]) by casper.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PDIhT-0006ew-E1; Tue, 02 Nov 2010 15:23:03 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753617Ab0KBPXA (ORCPT + 1 other); Tue, 2 Nov 2010 11:23:00 -0400 Received: from d1.icnet.pl ([212.160.220.21]:53992 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541Ab0KBPW7 (ORCPT ); Tue, 2 Nov 2010 11:22:59 -0400 Received: from 87-205-12-81.ip.netia.com.pl ([87.205.12.81] helo=vclass.intranet) by d1.icnet.pl with asmtp (TLS-1.0:DHE_RSA_AES_128_CBC_SHA:16) (Exim 4.34) id 1PDIhN-0002ns-TV; Tue, 02 Nov 2010 16:22:57 +0100 From: Janusz Krzysztofik Organization: Tele-Info-System, Poznan, PL To: Guennadi Liakhovetski Subject: [PATCH 2.6.37-rc1] SoC Camera: OMAP1: update for recent videobuf changes Date: Tue, 2 Nov 2010 16:22:32 +0100 User-Agent: KMail/1.9.10 Cc: Linux Media Mailing List , e3-hacking@earth.li MIME-Version: 1.0 Content-Disposition: inline Message-Id: <201011021622.33156.jkrzyszt@tis.icnet.pl> X-SA-Exim-Scanned: No (on d1.icnet); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Sender: Mauro Carvalho Chehab 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 --- drivers/media/video/omap1_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.37-rc1/drivers/media/video/omap1_camera.c.orig 2010-11-01 22:41:59.000000000 +0100 +++ linux-2.6.37-rc1/drivers/media/video/omap1_camera.c 2010-11-01 23:55:26.000000000 +0100 @@ -235,7 +235,7 @@ static void free_buffer(struct videobuf_ BUG_ON(in_interrupt()); - videobuf_waiton(vb, 0, 0); + videobuf_waiton(vq, vb, 0, 0); if (vb_mode == OMAP1_CAM_DMA_CONTIG) { videobuf_dma_contig_free(vq, vb); @@ -1365,12 +1365,12 @@ static void omap1_cam_init_videobuf(stru videobuf_queue_dma_contig_init(q, &omap1_videobuf_ops, icd->dev.parent, &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, - sizeof(struct omap1_cam_buf), icd); + sizeof(struct omap1_cam_buf), icd, NULL); else videobuf_queue_sg_init(q, &omap1_videobuf_ops, icd->dev.parent, &pcdev->lock, V4L2_BUF_TYPE_VIDEO_CAPTURE, V4L2_FIELD_NONE, - sizeof(struct omap1_cam_buf), icd); + sizeof(struct omap1_cam_buf), icd, NULL); /* use videobuf mode (auto)selected with the module parameter */ pcdev->vb_mode = sg_mode ? OMAP1_CAM_DMA_SG : OMAP1_CAM_DMA_CONTIG;