From: Jean-François Moine <moinejf@free.fr>
Date: Wed, 10 Aug 2011 10:40:47 +0000 (-0300)
Subject: [media] gspca - main: Handle the xHCI error on usb_set_interface()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=4274d84ce801b763615152b276e2a341a30c3a82;p=deliverable%2Flinux.git

[media] gspca - main: Handle the xHCI error on usb_set_interface()

This patch is adapted from a patch from Sarah Sharp (2010/05/03).
The xHCD handler checks the USB bandwidth on usb_set_interface()
instead of on usb_submit_urb().
Now, the same treatment is applied in case of error of both functions.

Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---

diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index ee9544894e8b..e41dfe254803 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -887,6 +887,8 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
 							gspca_dev->iface,
 							alt);
 				if (ret < 0) {
+					if (ret == -ENOSPC)
+						goto retry; /*fixme: ugly*/
 					pr_err("set alt %d err %d\n", alt, ret);
 					goto out;
 				}
@@ -942,6 +944,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
 
 		/* the bandwidth is not wide enough
 		 * negotiate or try a lower alternate setting */
+retry:
 		PDEBUG(D_ERR|D_STREAM,
 			"alt %d - bandwidth not wide enough - trying again",
 			alt);