From: Hans de Goede Date: Fri, 30 Dec 2011 21:26:53 +0000 (-0300) Subject: [media] gspca - main: Avoid clobbering all bandwidth when mic in webcam X-Git-Tag: v3.3-rc1~48^2~123 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d39059a656c0d0f61cfee8225f3d222dac7f3ac;p=platform%2Fkernel%2Flinux-3.10.git [media] gspca - main: Avoid clobbering all bandwidth when mic in webcam Signed-off-by: Hans de Goede Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 338dae4..4a3bbff 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -726,6 +726,23 @@ static int build_isoc_ep_tb(struct gspca_dev *gspca_dev, ep_tb++; } + /* + * If the camera: + * has a usb audio class interface (a built in usb mic); and + * is a usb 1 full speed device; and + * uses the max full speed iso bandwidth; and + * and has more than 1 alt setting + * then skip the highest alt setting to spare bandwidth for the mic + */ + if (gspca_dev->audio && + gspca_dev->dev->speed == USB_SPEED_FULL && + last_bw >= 1000000 && + i > 1) { + PDEBUG(D_STREAM, "dev has usb audio, skipping highest alt"); + i--; + ep_tb--; + } + /* get the requested bandwidth and start at the highest atlsetting */ bandwidth = which_bandwidth(gspca_dev); ep_tb--;