From patchwork Wed Oct  6 14:04:41 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Antonio Ospite <ospite@studenti.unina.it>
X-Patchwork-Id: 235931
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o96E4vfl008985
	for <patchwork-media@patchwork.kernel.org>;
	Wed, 6 Oct 2010 14:04:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756945Ab0JFOEx (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Wed, 6 Oct 2010 10:04:53 -0400
Received: from smtp207.alice.it ([82.57.200.103]:42557 "EHLO
	smtp207.alice.it"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1756693Ab0JFOEx (ORCPT <rfc822;linux-media@vger.kernel.org>);
	Wed, 6 Oct 2010 10:04:53 -0400
Received: from jcn (82.57.78.117) by smtp207.alice.it (8.5.124.08)
	(authenticated as fospite@alice.it)
	id 4C9E16C900C9AA33; Wed, 6 Oct 2010 16:04:49 +0200
Date: Wed, 6 Oct 2010 16:04:41 +0200
From: Antonio Ospite <ospite@studenti.unina.it>
To: Jean-Francois Moine <moinejf@free.fr>
Cc: linux-media@vger.kernel.org
Subject: Re: gspca, audio and ov534: regression.
Message-Id: <20101006160441.6ee9583d.ospite@studenti.unina.it>
In-Reply-To: <20101006134855.43879d74@tele>
References: <20101006123321.baade0a4.ospite@studenti.unina.it>
	<20101006134855.43879d74@tele>
X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; x86_64-pc-linux-gnu)
X-Face: z*RaLf`X<@C75u6Ig9}{oW$H; 1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;
	]yA5<GWI5`6u&+ ; 6b'@y|8w"wB;
	4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
	!pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
Mime-Version: 1.0
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 (demeter1.kernel.org [140.211.167.41]);
	Wed, 06 Oct 2010 14:04:57 +0000 (UTC)


diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index b984610..30e0b32 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -651,7 +651,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
                                   : USB_ENDPOINT_XFER_ISOC;
        i = gspca_dev->alt;                     /* previous alt setting */
        if (gspca_dev->cam.reverse_alts) {
-               if (gspca_dev->audio)
+               if (gspca_dev->audio && !gspca_dev->cam.bulk)
                        i++;
                while (++i < gspca_dev->nbalt) {
                        ep = alt_xfer(&intf->altsetting[i], xfer);
@@ -659,7 +659,7 @@ static struct usb_host_endpoint *get_ep(struct gspca_dev *gspca_dev)
                                break;
                }
        } else {
-               if (gspca_dev->audio)
+               if (gspca_dev->audio && !gspca_dev->cam.bulk)
                        i--;
                while (--i >= 0) {
                        ep = alt_xfer(&intf->altsetting[i], xfer);