From patchwork Tue Nov 2 15:08:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 4779 Return-path: Envelope-to: mchehab@gaivota Delivery-date: Tue, 02 Nov 2010 11:27:05 -0400 Received: from mchehab by gaivota with local (Exim 4.72) (envelope-from ) id 1PDIlN-0003Mb-8J for mchehab@gaivota; Tue, 02 Nov 2010 11:27:05 -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:05 -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 1PDIUJ-0006HU-C2; Tue, 02 Nov 2010 15:09:27 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753522Ab0KBPJY (ORCPT + 1 other); Tue, 2 Nov 2010 11:09:24 -0400 Received: from d1.icnet.pl ([212.160.220.21]:50941 "EHLO d1.icnet.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753237Ab0KBPJY (ORCPT ); Tue, 2 Nov 2010 11:09:24 -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 1PDIUC-0001NO-IB; Tue, 02 Nov 2010 16:09:23 +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 framework changes Date: Tue, 2 Nov 2010 16:08:51 +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: <201011021608.52379.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 The recently added OMAP1 camera driver was not ready for one video queue per device framework changes. Fix it. Created and tested against linux-2.6.37-rc1. Signed-off-by: Janusz Krzysztofik --- drivers/media/video/omap1_camera.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 @@ -1386,7 +1386,7 @@ static void omap1_cam_init_videobuf(stru } } -static int omap1_cam_reqbufs(struct soc_camera_file *icf, +static int omap1_cam_reqbufs(struct soc_camera_device *icd, struct v4l2_requestbuffers *p) { int i; @@ -1398,7 +1398,7 @@ static int omap1_cam_reqbufs(struct soc_ * it hadn't triggered */ for (i = 0; i < p->count; i++) { - struct omap1_cam_buf *buf = container_of(icf->vb_vidq.bufs[i], + struct omap1_cam_buf *buf = container_of(icd->vb_vidq.bufs[i], struct omap1_cam_buf, vb); buf->inwork = 0; INIT_LIST_HEAD(&buf->vb.queue); @@ -1485,10 +1485,10 @@ static int omap1_cam_set_bus_param(struc static unsigned int omap1_cam_poll(struct file *file, poll_table *pt) { - struct soc_camera_file *icf = file->private_data; + struct soc_camera_device *icd = file->private_data; struct omap1_cam_buf *buf; - buf = list_entry(icf->vb_vidq.stream.next, struct omap1_cam_buf, + buf = list_entry(icd->vb_vidq.stream.next, struct omap1_cam_buf, vb.stream); poll_wait(file, &buf->vb.done, pt);