aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c')
-rw-r--r--drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
index e95fa8997d22..bf3e5c317a26 100644
--- a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
+++ b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c
@@ -131,6 +131,7 @@ static int vv6410_init(struct sd *sd)
131static int vv6410_start(struct sd *sd) 131static int vv6410_start(struct sd *sd)
132{ 132{
133 int err; 133 int err;
134 struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
134 struct cam *cam = &sd->gspca_dev.cam; 135 struct cam *cam = &sd->gspca_dev.cam;
135 u32 priv = cam->cam_mode[sd->gspca_dev.curr_mode].priv; 136 u32 priv = cam->cam_mode[sd->gspca_dev.curr_mode].priv;
136 137
@@ -163,6 +164,7 @@ static int vv6410_start(struct sd *sd)
163 164
164static int vv6410_stop(struct sd *sd) 165static int vv6410_stop(struct sd *sd)
165{ 166{
167 struct gspca_dev *gspca_dev = (struct gspca_dev *)sd;
166 int err; 168 int err;
167 169
168 /* Turn off LED */ 170 /* Turn off LED */
@@ -208,7 +210,7 @@ static int vv6410_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
208 else 210 else
209 i2c_data &= ~VV6410_HFLIP; 211 i2c_data &= ~VV6410_HFLIP;
210 212
211 PDEBUG(D_V4L2, "Set horizontal flip to %d", val); 213 PDEBUG(D_CONF, "Set horizontal flip to %d", val);
212 err = stv06xx_write_sensor(sd, VV6410_DATAFORMAT, i2c_data); 214 err = stv06xx_write_sensor(sd, VV6410_DATAFORMAT, i2c_data);
213 215
214 return (err < 0) ? err : 0; 216 return (err < 0) ? err : 0;
@@ -229,7 +231,7 @@ static int vv6410_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
229 else 231 else
230 i2c_data &= ~VV6410_VFLIP; 232 i2c_data &= ~VV6410_VFLIP;
231 233
232 PDEBUG(D_V4L2, "Set vertical flip to %d", val); 234 PDEBUG(D_CONF, "Set vertical flip to %d", val);
233 err = stv06xx_write_sensor(sd, VV6410_DATAFORMAT, i2c_data); 235 err = stv06xx_write_sensor(sd, VV6410_DATAFORMAT, i2c_data);
234 236
235 return (err < 0) ? err : 0; 237 return (err < 0) ? err : 0;
@@ -240,7 +242,7 @@ static int vv6410_set_analog_gain(struct gspca_dev *gspca_dev, __s32 val)
240 int err; 242 int err;
241 struct sd *sd = (struct sd *) gspca_dev; 243 struct sd *sd = (struct sd *) gspca_dev;
242 244
243 PDEBUG(D_V4L2, "Set analog gain to %d", val); 245 PDEBUG(D_CONF, "Set analog gain to %d", val);
244 err = stv06xx_write_sensor(sd, VV6410_ANALOGGAIN, 0xf0 | (val & 0xf)); 246 err = stv06xx_write_sensor(sd, VV6410_ANALOGGAIN, 0xf0 | (val & 0xf));
245 247
246 return (err < 0) ? err : 0; 248 return (err < 0) ? err : 0;
@@ -257,7 +259,7 @@ static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
257 fine = val % VV6410_CIF_LINELENGTH; 259 fine = val % VV6410_CIF_LINELENGTH;
258 coarse = min(512, val / VV6410_CIF_LINELENGTH); 260 coarse = min(512, val / VV6410_CIF_LINELENGTH);
259 261
260 PDEBUG(D_V4L2, "Set coarse exposure to %d, fine expsure to %d", 262 PDEBUG(D_CONF, "Set coarse exposure to %d, fine expsure to %d",
261 coarse, fine); 263 coarse, fine);
262 264
263 err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); 265 err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8);