From e626e39f6b0673bd051d1ead60978e80c9ed43f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Moine?= Date: Wed, 30 Nov 2011 05:12:54 -0300 Subject: [PATCH] --- yaml --- r: 285354 b: refs/heads/master c: a67648797a9cc5a407b7b81825b48ca5920c0c91 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/benq.c | 1 - trunk/drivers/media/video/gspca/gspca.h | 1 - trunk/drivers/media/video/gspca/nw80x.c | 1 - trunk/drivers/media/video/gspca/ov519.c | 1 - trunk/drivers/media/video/gspca/xirlink_cit.c | 2 -- 6 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7c2685d3d00f..968b09ff0b99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50815707eebc7ce12bfd97933a6e68a482c4d7ab +refs/heads/master: a67648797a9cc5a407b7b81825b48ca5920c0c91 diff --git a/trunk/drivers/media/video/gspca/benq.c b/trunk/drivers/media/video/gspca/benq.c index 6ae26160b81f..1d1a412d6264 100644 --- a/trunk/drivers/media/video/gspca/benq.c +++ b/trunk/drivers/media/video/gspca/benq.c @@ -76,7 +76,6 @@ static int sd_config(struct gspca_dev *gspca_dev, gspca_dev->cam.cam_mode = vga_mode; gspca_dev->cam.nmodes = ARRAY_SIZE(vga_mode); gspca_dev->cam.no_urb_create = 1; - gspca_dev->cam.reverse_alts = 1; return 0; } diff --git a/trunk/drivers/media/video/gspca/gspca.h b/trunk/drivers/media/video/gspca/gspca.h index e444f16e1497..65ddb84cacd9 100644 --- a/trunk/drivers/media/video/gspca/gspca.h +++ b/trunk/drivers/media/video/gspca/gspca.h @@ -69,7 +69,6 @@ struct cam { u8 bulk; /* image transfer by 0:isoc / 1:bulk */ u8 npkt; /* number of packets in an ISOC message * 0 is the default value: 32 packets */ - u8 reverse_alts; /* Alt settings are in high to low order */ }; struct gspca_dev; diff --git a/trunk/drivers/media/video/gspca/nw80x.c b/trunk/drivers/media/video/gspca/nw80x.c index 7681814e594f..3830054a683e 100644 --- a/trunk/drivers/media/video/gspca/nw80x.c +++ b/trunk/drivers/media/video/gspca/nw80x.c @@ -1763,7 +1763,6 @@ static int sd_config(struct gspca_dev *gspca_dev, if ((unsigned) webcam >= NWEBCAMS) webcam = 0; sd->webcam = webcam; - gspca_dev->cam.reverse_alts = 1; gspca_dev->cam.ctrls = sd->ctrls; sd->ag_cnt = -1; diff --git a/trunk/drivers/media/video/gspca/ov519.c b/trunk/drivers/media/video/gspca/ov519.c index 6a01b35a9478..3d68ad5015d5 100644 --- a/trunk/drivers/media/video/gspca/ov519.c +++ b/trunk/drivers/media/video/gspca/ov519.c @@ -3348,7 +3348,6 @@ static int sd_config(struct gspca_dev *gspca_dev, case BRIDGE_W9968CF: cam->cam_mode = w9968cf_vga_mode; cam->nmodes = ARRAY_SIZE(w9968cf_vga_mode); - cam->reverse_alts = 1; break; } diff --git a/trunk/drivers/media/video/gspca/xirlink_cit.c b/trunk/drivers/media/video/gspca/xirlink_cit.c index 3aed42acdb5a..628ba535026f 100644 --- a/trunk/drivers/media/video/gspca/xirlink_cit.c +++ b/trunk/drivers/media/video/gspca/xirlink_cit.c @@ -995,14 +995,12 @@ static int sd_config(struct gspca_dev *gspca_dev, case CIT_MODEL0: cam->cam_mode = model0_mode; cam->nmodes = ARRAY_SIZE(model0_mode); - cam->reverse_alts = 1; gspca_dev->ctrl_dis = ~((1 << SD_CONTRAST) | (1 << SD_HFLIP)); sd->sof_len = 4; break; case CIT_MODEL1: cam->cam_mode = cif_yuv_mode; cam->nmodes = ARRAY_SIZE(cif_yuv_mode); - cam->reverse_alts = 1; gspca_dev->ctrl_dis = (1 << SD_HUE) | (1 << SD_HFLIP); sd->sof_len = 4; break;