Skip to content

Commit

Permalink
V4L/DVB: gspca - ov534_9: Propagate USB errors to higher level
Browse files Browse the repository at this point in the history
Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jean-Francois Moine authored and Mauro Carvalho Chehab committed Feb 26, 2010
1 parent ab6c8cf commit 4b27d07
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions drivers/media/video/gspca/ov534_9.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down

0 comments on commit 4b27d07

Please sign in to comment.