From patchwork Mon Aug 17 17:47:44 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Paris X-Patchwork-Id: 1498 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Mon, 17 Aug 2009 17:55:56 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Mon, 17 Aug 2009 15:12:36 -0300 (BRT) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1Md6R1-0000Yq-W8; Mon, 17 Aug 2009 17:55:56 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932383AbZHQRzv (ORCPT + 1 other); Mon, 17 Aug 2009 13:55:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932284AbZHQRzv (ORCPT ); Mon, 17 Aug 2009 13:55:51 -0400 Received: from jim.sh ([75.150.123.25]:60612 "EHLO psychosis.jim.sh" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751961AbZHQRzu convert rfc822-to-8bit (ORCPT ); Mon, 17 Aug 2009 13:55:50 -0400 X-Greylist: delayed 471 seconds by postgrey-1.27 at vger.kernel.org; Mon, 17 Aug 2009 13:55:50 EDT Received: from psychosis.jim.sh (localhost [127.0.0.1]) by psychosis.jim.sh (8.14.3/8.14.3/Debian-5) with ESMTP id n7HHliwG015807 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Mon, 17 Aug 2009 13:47:44 -0400 Received: (from jim@localhost) by psychosis.jim.sh (8.14.3/8.14.3/Submit) id n7HHlikV015806; Mon, 17 Aug 2009 13:47:44 -0400 Date: Mon, 17 Aug 2009 13:47:44 -0400 From: Jim Paris To: linux-media@vger.kernel.org, Jean-Francois Moine , Mauro Carvalho Chehab Subject: ov534 + ov772x (playstation eye) broken in 2.6.30 Message-ID: <20090817174744.GA11933@psychosis.jim.sh> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.94.2/9704/Sun Aug 16 21:54:29 2009 on psychosis.jim.sh X-Virus-Status: Clean Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Hi, Commit 84fbdf87ab8eaa4eaefb317a7eb437cd4d3d0ebf: "V4L/DVB (11105): gspca - ov534: Adjust the packet scan function" broke the gspca ov534 driver for the Playstation Eye in 2.6.30. Commit c874f3aa7e66158dccb2b9f3cfc46c65af6c223d: "V4L/DVB (11973): gspca - ov534: Do the ov772x work again." fixes it for 2.6.31, but this leaves 2.6.30 users out in the cold. I'd like to submit the fix to the -stable team in hopes that it can get included in 2.6.30.6. Unfortunately 84fbdf87 depends on earlier patches. The below patch is similar to 84fbdf87 but applies to 2.6.30.5. Does this look acceptable? -jim From 8dc9e3749ccb3f500fb8597454561ce18bf39cec Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Mon, 17 Aug 2009 13:45:00 -0400 Subject: [PATCH] gspca - ov534: Fix ov772x The scan of the image packets of the sensor ov772x was broken when the sensor ov965x was added. [ Based on upstream 84fbdf87, reworked for v2.6.30.5 ] Signed-off-by: Jim Paris Acked-by: Jean-Francois Moine --- drivers/media/video/gspca/ov534.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/media/video/gspca/ov534.c b/drivers/media/video/gspca/ov534.c index 19e0bc6..504f849 100644 --- a/drivers/media/video/gspca/ov534.c +++ b/drivers/media/video/gspca/ov534.c @@ -832,9 +832,11 @@ static void sd_pkt_scan(struct gspca_dev *gspca_dev, struct gspca_frame *frame, __u32 this_pts; u16 this_fid; int remaining_len = len; + int payload_len; + payload_len = (sd->sensor == SENSOR_OV772X) ? 2048 : 2040; do { - len = min(remaining_len, 2040); /*fixme: was 2048*/ + len = min(remaining_len, payload_len); /* Payloads are prefixed with a UVC-style header. We consider a frame to start when the FID toggles, or the PTS