[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 ee9544894e8b4ce98339617a90b6cdf0dddb1a41..e41dfe2548039eb817fc72562f894ae3562b4a7f 100644 (file)
--- 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);