On 2012-04-23 13:51:25 +0200, Hans Verkuil wrote: > From: Hans Verkuil <hans.verkuil@xxxxxxxxx> [...] > --- > drivers/media/video/au0828/au0828-video.c | 4 ++-- > drivers/media/video/cx23885/cx23888-ir.c | 4 +--- > drivers/media/video/cx25840/cx25840-ir.c | 6 +----- > drivers/media/video/em28xx/em28xx-audio.c | 9 +++++---- > drivers/media/video/et61x251/et61x251_core.c | 11 ++++------- > drivers/media/video/hdpvr/hdpvr-control.c | 2 ++ > drivers/media/video/hdpvr/hdpvr-video.c | 2 +- > drivers/media/video/saa7134/saa7134-video.c | 2 +- > drivers/media/video/sn9c102/sn9c102_core.c | 4 +--- > 9 files changed, 18 insertions(+), 26 deletions(-) > [...] > diff --git a/drivers/media/video/hdpvr/hdpvr-control.c b/drivers/media/video/hdpvr/hdpvr-control.c > index 068df4b..ae8f229 100644 > --- a/drivers/media/video/hdpvr/hdpvr-control.c > +++ b/drivers/media/video/hdpvr/hdpvr-control.c > @@ -113,6 +113,8 @@ int get_input_lines_info(struct hdpvr_device *dev) > "get input lines info returned: %d, %s\n", ret, > print_buf); > } > +#else > + (void)ret; /* suppress compiler warning */ > #endif > lines = dev->usbc_buf[1] << 8 | dev->usbc_buf[0]; > mutex_unlock(&dev->usbc_mutex); > diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c > index 11ffe9c..0e9e156 100644 > --- a/drivers/media/video/hdpvr/hdpvr-video.c > +++ b/drivers/media/video/hdpvr/hdpvr-video.c > @@ -994,7 +994,7 @@ static int hdpvr_try_ctrl(struct v4l2_ext_control *ctrl, int ac3) > default: > return -EINVAL; > } > - return 0; > + return ret; > } > > static int vidioc_try_ext_ctrls(struct file *file, void *priv, Acked-by: Janne Grunau <j@xxxxxxxxxx> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
