aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/cpia1.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/gspca/cpia1.c')
-rw-r--r--drivers/media/video/gspca/cpia1.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/video/gspca/cpia1.c b/drivers/media/video/gspca/cpia1.c
index 9ddbac680663..f2a9451eea19 100644
--- a/drivers/media/video/gspca/cpia1.c
+++ b/drivers/media/video/gspca/cpia1.c
@@ -1262,7 +1262,7 @@ static int set_flicker(struct gspca_dev *gspca_dev, int on, int apply)
1262static void monitor_exposure(struct gspca_dev *gspca_dev) 1262static void monitor_exposure(struct gspca_dev *gspca_dev)
1263{ 1263{
1264 struct sd *sd = (struct sd *) gspca_dev; 1264 struct sd *sd = (struct sd *) gspca_dev;
1265 u8 exp_acc, bcomp, gain, coarseL, cmd[8]; 1265 u8 exp_acc, bcomp, cmd[8];
1266 int ret, light_exp, dark_exp, very_dark_exp; 1266 int ret, light_exp, dark_exp, very_dark_exp;
1267 int old_exposure, new_exposure, framerate; 1267 int old_exposure, new_exposure, framerate;
1268 int setfps = 0, setexp = 0, setflicker = 0; 1268 int setfps = 0, setexp = 0, setflicker = 0;
@@ -1284,8 +1284,6 @@ static void monitor_exposure(struct gspca_dev *gspca_dev)
1284 } 1284 }
1285 exp_acc = gspca_dev->usb_buf[0]; 1285 exp_acc = gspca_dev->usb_buf[0];
1286 bcomp = gspca_dev->usb_buf[1]; 1286 bcomp = gspca_dev->usb_buf[1];
1287 gain = gspca_dev->usb_buf[2];
1288 coarseL = gspca_dev->usb_buf[3];
1289 1287
1290 light_exp = sd->params.colourParams.brightness + 1288 light_exp = sd->params.colourParams.brightness +
1291 TC - 50 + EXP_ACC_LIGHT; 1289 TC - 50 + EXP_ACC_LIGHT;
@@ -1772,9 +1770,7 @@ static void sd_stopN(struct gspca_dev *gspca_dev)
1772/* this function is called at probe and resume time */ 1770/* this function is called at probe and resume time */
1773static int sd_init(struct gspca_dev *gspca_dev) 1771static int sd_init(struct gspca_dev *gspca_dev)
1774{ 1772{
1775#ifdef GSPCA_DEBUG
1776 struct sd *sd = (struct sd *) gspca_dev; 1773 struct sd *sd = (struct sd *) gspca_dev;
1777#endif
1778 int ret; 1774 int ret;
1779 1775
1780 /* Start / Stop the camera to make sure we are talking to 1776 /* Start / Stop the camera to make sure we are talking to