aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/gspca/ov534_9.c
diff options
context:
space:
mode:
authorJean-Francois Moine <moinejf@free.fr>2010-01-13 13:40:36 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:47 -0500
commit4b27d074748553916ebbdeed9630a6959c85e7de (patch)
treec552e4707f837f491595d99d60d434723317e17e /drivers/media/video/gspca/ov534_9.c
parentab6c8cf21e180bcee1a6669f59ef62c0cceaf5d6 (diff)
V4L/DVB: gspca - ov534_9: Propagate USB errors to higher level
Signed-off-by: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/gspca/ov534_9.c')
-rw-r--r--drivers/media/video/gspca/ov534_9.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/gspca/ov534_9.c b/drivers/media/video/gspca/ov534_9.c
index 464b7f50827d..bbe5a030e3b4 100644
--- a/drivers/media/video/gspca/ov534_9.c
+++ b/drivers/media/video/gspca/ov534_9.c
@@ -1113,7 +1113,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
1113 set_led(gspca_dev, 0); 1113 set_led(gspca_dev, 0);
1114 reg_w(gspca_dev, 0xe0, 0x00); 1114 reg_w(gspca_dev, 0xe0, 0x00);
1115 1115
1116 return 0; 1116 return gspca_dev->usb_err;
1117} 1117}
1118 1118
1119static int sd_start(struct gspca_dev *gspca_dev) 1119static int sd_start(struct gspca_dev *gspca_dev)
@@ -1172,7 +1172,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
1172 reg_w(gspca_dev, 0xe0, 0x00); 1172 reg_w(gspca_dev, 0xe0, 0x00);
1173 reg_w(gspca_dev, 0xe0, 0x00); 1173 reg_w(gspca_dev, 0xe0, 0x00);
1174 set_led(gspca_dev, 1); 1174 set_led(gspca_dev, 1);
1175 return 0; 1175 return gspca_dev->usb_err;
1176} 1176}
1177 1177
1178static void sd_stopN(struct gspca_dev *gspca_dev) 1178static void sd_stopN(struct gspca_dev *gspca_dev)
@@ -1271,7 +1271,7 @@ static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val)
1271 sd->brightness = val; 1271 sd->brightness = val;
1272 if (gspca_dev->streaming) 1272 if (gspca_dev->streaming)
1273 setbrightness(gspca_dev); 1273 setbrightness(gspca_dev);
1274 return 0; 1274 return gspca_dev->usb_err;
1275} 1275}
1276 1276
1277static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val) 1277static int sd_getbrightness(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1289,7 +1289,7 @@ static int sd_setcontrast(struct gspca_dev *gspca_dev, __s32 val)
1289 sd->contrast = val; 1289 sd->contrast = val;
1290 if (gspca_dev->streaming) 1290 if (gspca_dev->streaming)
1291 setcontrast(gspca_dev); 1291 setcontrast(gspca_dev);
1292 return 0; 1292 return gspca_dev->usb_err;
1293} 1293}
1294 1294
1295static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val) 1295static int sd_getcontrast(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1313,7 +1313,7 @@ static int sd_setautogain(struct gspca_dev *gspca_dev, __s32 val)
1313 gspca_dev->ctrl_inac &= ~(1 << EXPO_IDX); 1313 gspca_dev->ctrl_inac &= ~(1 << EXPO_IDX);
1314 setautogain(gspca_dev); 1314 setautogain(gspca_dev);
1315 } 1315 }
1316 return 0; 1316 return gspca_dev->usb_err;
1317} 1317}
1318 1318
1319static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val) 1319static int sd_getautogain(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1331,7 +1331,7 @@ static int sd_setexposure(struct gspca_dev *gspca_dev, __s32 val)
1331 sd->exposure = val; 1331 sd->exposure = val;
1332 if (gspca_dev->streaming) 1332 if (gspca_dev->streaming)
1333 setexposure(gspca_dev); 1333 setexposure(gspca_dev);
1334 return 0; 1334 return gspca_dev->usb_err;
1335} 1335}
1336 1336
1337static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val) 1337static int sd_getexposure(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1349,7 +1349,7 @@ static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val)
1349 sd->sharpness = val; 1349 sd->sharpness = val;
1350 if (gspca_dev->streaming) 1350 if (gspca_dev->streaming)
1351 setsharpness(gspca_dev); 1351 setsharpness(gspca_dev);
1352 return 0; 1352 return gspca_dev->usb_err;
1353} 1353}
1354 1354
1355static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val) 1355static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1367,7 +1367,7 @@ static int sd_setsatur(struct gspca_dev *gspca_dev, __s32 val)
1367 sd->satur = val; 1367 sd->satur = val;
1368 if (gspca_dev->streaming) 1368 if (gspca_dev->streaming)
1369 setsatur(gspca_dev); 1369 setsatur(gspca_dev);
1370 return 0; 1370 return gspca_dev->usb_err;
1371} 1371}
1372 1372
1373static int sd_getsatur(struct gspca_dev *gspca_dev, __s32 *val) 1373static int sd_getsatur(struct gspca_dev *gspca_dev, __s32 *val)
@@ -1384,7 +1384,7 @@ static int sd_setfreq(struct gspca_dev *gspca_dev, __s32 val)
1384 sd->freq = val; 1384 sd->freq = val;
1385 if (gspca_dev->streaming) 1385 if (gspca_dev->streaming)
1386 setfreq(gspca_dev); 1386 setfreq(gspca_dev);
1387 return 0; 1387 return gspca_dev->usb_err;
1388} 1388}
1389 1389
1390static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val) 1390static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)