aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorJean-François Moine <moinejf@free.fr>2011-02-10 06:10:50 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 19:32:07 -0400
commit062909f64981678899a1abbe16a616b0e92fc615 (patch)
treeeb331a50383b317e3693471c7db56c40911853af /drivers/media/video
parent5c95606b1d94a6dc62df0af2bc0d3e0e9a2e6cce (diff)
[media] gspca - sonixj, zc3xx: Let some bandwidth for audio when USB 1.1
Signed-off-by: Jean-François Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/gspca/sonixj.c4
-rw-r--r--drivers/media/video/gspca/zc3xx.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c
index eb7b2613ab45..a1f82a92833d 100644
--- a/drivers/media/video/gspca/sonixj.c
+++ b/drivers/media/video/gspca/sonixj.c
@@ -1777,6 +1777,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
1777 sd->ag_cnt = -1; 1777 sd->ag_cnt = -1;
1778 sd->quality = QUALITY_DEF; 1778 sd->quality = QUALITY_DEF;
1779 1779
1780 /* if USB 1.1, let some bandwidth for the audio device */
1781 if (gspca_dev->audio && gspca_dev->dev->speed < USB_SPEED_HIGH)
1782 gspca_dev->nbalt--;
1783
1780 INIT_WORK(&sd->work, qual_upd); 1784 INIT_WORK(&sd->work, qual_upd);
1781 1785
1782 return 0; 1786 return 0;
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index 47236a58bf33..b2014915f9c1 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -6414,6 +6414,10 @@ static int sd_config(struct gspca_dev *gspca_dev,
6414 gspca_dev->cam.ctrls = sd->ctrls; 6414 gspca_dev->cam.ctrls = sd->ctrls;
6415 sd->quality = QUALITY_DEF; 6415 sd->quality = QUALITY_DEF;
6416 6416
6417 /* if USB 1.1, let some bandwidth for the audio device */
6418 if (gspca_dev->audio && gspca_dev->dev->speed < USB_SPEED_HIGH)
6419 gspca_dev->nbalt--;
6420
6417 return 0; 6421 return 0;
6418} 6422}
6419 6423