Commit 4274d84c authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab

[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: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 27b12023
...@@ -887,6 +887,8 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev) ...@@ -887,6 +887,8 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
gspca_dev->iface, gspca_dev->iface,
alt); alt);
if (ret < 0) { if (ret < 0) {
if (ret == -ENOSPC)
goto retry; /*fixme: ugly*/
pr_err("set alt %d err %d\n", alt, ret); pr_err("set alt %d err %d\n", alt, ret);
goto out; goto out;
} }
...@@ -942,6 +944,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev) ...@@ -942,6 +944,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
/* the bandwidth is not wide enough /* the bandwidth is not wide enough
* negotiate or try a lower alternate setting */ * negotiate or try a lower alternate setting */
retry:
PDEBUG(D_ERR|D_STREAM, PDEBUG(D_ERR|D_STREAM,
"alt %d - bandwidth not wide enough - trying again", "alt %d - bandwidth not wide enough - trying again",
alt); alt);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment