From patchwork Sun May 30 22:27:17 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Olivier Lorin <olorin75@gmail.com>
X-Patchwork-Id: 103173
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4UMRNoY014378
	for <patchwork-media@patchwork.kernel.org>;
	Sun, 30 May 2010 22:27:23 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752399Ab0E3W1W (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Sun, 30 May 2010 18:27:22 -0400
Received: from mail-wy0-f174.google.com ([74.125.82.174]:43757 "EHLO
	mail-wy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751266Ab0E3W1V (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Sun, 30 May 2010 18:27:21 -0400
Received: by wyb36 with SMTP id 36so927660wyb.19
	for <linux-media@vger.kernel.org>;
	Sun, 30 May 2010 15:27:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:subject:from:to:cc
	:content-type:date:message-id:mime-version:x-mailer
	:content-transfer-encoding;
	bh=LKa3wjjHjeOuqkjl5AtT3lkmaF3Si+GeEtMQLInYvX8=;
	b=un6j988JmcmfXU1TPuIvJ7Vq1MVfSCNPnhrfHwokZXeEqaJIjef+okKjT9qhLy8lNQ
	ljX1NwVH1NdEIY3YoMlevKQaymZVFSVuWbNWRhH8k5h+JFpu33nZKefsso3hZTROqxB+
	470iU55eZZvGZ/u4ZHay7begBffU13d9N9PSM=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=subject:from:to:cc:content-type:date:message-id:mime-version
	:x-mailer:content-transfer-encoding;
	b=RXmIjBKsPCYGbZWC5n8UPsKUp0RhntGxt68dgnaP0ZCGDbaDKawMWWwMVwAo2KWAzf
	PuaDNGXW2i1O/fdkAnoFCF92E7CY+p6MPVXvkGgFdbTTVJgHvdggEQLvwCXBHR2Ha1ph
	/WdHYduDyReVVIoxiU8MaLOp/pnGXaGYpIrOg=
Received: by 10.227.156.7 with SMTP id u7mr3426853wbw.143.1275258439985;
	Sun, 30 May 2010 15:27:19 -0700 (PDT)
Received: from [192.168.1.4] (cha25-4-78-248-177-42.fbx.proxad.net
	[78.248.177.42]) by mx.google.com with ESMTPS id
	h22sm30044665wbh.3.2010.05.30.15.27.18
	(version=SSLv3 cipher=RC4-MD5);
	Sun, 30 May 2010 15:27:19 -0700 (PDT)
Subject: [PATCH 3/3] Gspca-gl860 driver update
From: Olivier Lorin <olorin75@gmail.com>
To: V4L Mailing List <linux-media@vger.kernel.org>
Cc: Jean-Francois Moine <moinejf@free.fr>
Date: Mon, 31 May 2010 00:27:17 +0200
Message-Id: <1275258437.18267.27.camel@miniol>
Mime-Version: 1.0
X-Mailer: Evolution 2.24.3 
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Sun, 30 May 2010 22:27:23 +0000 (UTC)


diff -urpN der_gl860i3/gl860.c gl860/gl860.c
--- der_gl860i3/gl860.c	2010-04-29 21:01:15.000000000 +0200
+++ gl860/gl860.c	2010-04-28 23:45:19.000000000 +0200
@@ -63,7 +63,7 @@ static int sd_set_##thename(struct gspca
 \
 	sd->vcur.thename = val;\
 	if (gspca_dev->streaming)\
-		sd->dev_camera_settings(gspca_dev);\
+		sd->waitSet = 1;\
 	return 0;\
 } \
 static int sd_get_##thename(struct gspca_dev *gspca_dev, s32 *val)\
@@ -595,10 +595,7 @@ int gl860_RTx(struct gspca_dev *gspca_de
 	else if (len > 1 && r < len)
 		PDEBUG(D_ERR, "short ctrl transfer %d/%d", r, len);
 
-	if (_MI2020_ && (val || index))
-		msleep(1);
-	if (_OV2640_)
-		msleep(1);
+	msleep(1);
 
 	return r;
 }