From 2a834bccee20af4ee668aa0db359fd58db7827a2 Mon Sep 17 00:00:00 2001 From: Jean-Francois Moine Date: Wed, 13 Jan 2010 15:40:36 -0300 Subject: [PATCH] --- yaml --- r: 181591 b: refs/heads/master c: 4b27d074748553916ebbdeed9630a6959c85e7de h: refs/heads/master i: 181589: 6e77d1292d7ea63f8455f1dc17b4604f507ed19b 181587: b1748d656fd0b8edbaeb13c0df74c242ae6237b3 181583: c1983a0fba7cb17bf2d43e86f0914008e8344baf v: v3 --- [refs] | 2 +- trunk/drivers/media/video/gspca/ov534_9.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index a161716e5048..5c7f993d0711 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab6c8cf21e180bcee1a6669f59ef62c0cceaf5d6 +refs/heads/master: 4b27d074748553916ebbdeed9630a6959c85e7de diff --git a/trunk/drivers/media/video/gspca/ov534_9.c b/trunk/drivers/media/video/gspca/ov534_9.c index 464b7f50827d..bbe5a030e3b4 100644 --- a/trunk/drivers/media/video/gspca/ov534_9.c +++ b/trunk/drivers/media/video/gspca/ov534_9.c @@ -1113,7 +1113,7 @@ static int sd_init(struct gspca_dev *gspca_dev) set_led(gspca_dev, 0); reg_w(gspca_dev, 0xe0, 0x00); - return 0; + return gspca_dev->usb_err; } static int sd_start(struct gspca_dev *gspca_dev) @@ -1172,7 +1172,7 @@ static int sd_start(struct gspca_dev *gspca_dev) reg_w(gspca_dev, 0xe0, 0x00); reg_w(gspca_dev, 0xe0, 0x00); set_led(gspca_dev, 1); - return 0; + return gspca_dev->usb_err; } static void sd_stopN(struct gspca_dev *gspca_dev) @@ -1271,7 +1271,7 @@ static int sd_setbrightness(struct gspca_dev *gspca_dev, __s32 val) sd->brightness = val; if (gspca_dev->streaming) setbrightness(gspca_dev); - return 0; + return gspca_dev->usb_err; } static 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) sd->contrast = val; if (gspca_dev->streaming) setcontrast(gspca_dev); - return 0; + return gspca_dev->usb_err; } static 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) gspca_dev->ctrl_inac &= ~(1 << EXPO_IDX); setautogain(gspca_dev); } - return 0; + return gspca_dev->usb_err; } static 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) sd->exposure = val; if (gspca_dev->streaming) setexposure(gspca_dev); - return 0; + return gspca_dev->usb_err; } static 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) sd->sharpness = val; if (gspca_dev->streaming) setsharpness(gspca_dev); - return 0; + return gspca_dev->usb_err; } static 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) sd->satur = val; if (gspca_dev->streaming) setsatur(gspca_dev); - return 0; + return gspca_dev->usb_err; } static 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) sd->freq = val; if (gspca_dev->streaming) setfreq(gspca_dev); - return 0; + return gspca_dev->usb_err; } static int sd_getfreq(struct gspca_dev *gspca_dev, __s32 *val)