From 661f957bce2a9ba70869f4d732c659e35f444b6e Mon Sep 17 00:00:00 2001 From: Peter Senna Tschudin Date: Tue, 4 Sep 2012 08:05:03 -0300 Subject: [PATCH] --- yaml --- r: 331034 b: refs/heads/master c: 9a888ba273b8bbd82a0b88cfd57c270f6eb8d724 h: refs/heads/master v: v3 --- [refs] | 2 +- .../drivers/media/platform/davinci/vpfe_capture.c | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 2dd768ce0a73..44b89971dc48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a84b17e20f51dbc4f5c0aedb00d66f4f7d2ede8d +refs/heads/master: 9a888ba273b8bbd82a0b88cfd57c270f6eb8d724 diff --git a/trunk/drivers/media/platform/davinci/vpfe_capture.c b/trunk/drivers/media/platform/davinci/vpfe_capture.c index 843b138faabe..f99198cebd35 100644 --- a/trunk/drivers/media/platform/davinci/vpfe_capture.c +++ b/trunk/drivers/media/platform/davinci/vpfe_capture.c @@ -1131,11 +1131,11 @@ static int vpfe_s_input(struct file *file, void *priv, unsigned int index) ret = -EBUSY; goto unlock_out; } - - if (vpfe_get_subdev_input_index(vpfe_dev, - &subdev_index, - &inp_index, - index) < 0) { + ret = vpfe_get_subdev_input_index(vpfe_dev, + &subdev_index, + &inp_index, + index); + if (ret < 0) { v4l2_err(&vpfe_dev->v4l2_dev, "invalid input index\n"); goto unlock_out; } @@ -1748,8 +1748,9 @@ static long vpfe_param_handler(struct file *file, void *priv, "Error setting parameters in CCDC\n"); goto unlock_out; } - if (vpfe_get_ccdc_image_format(vpfe_dev, - &vpfe_dev->fmt) < 0) { + ret = vpfe_get_ccdc_image_format(vpfe_dev, + &vpfe_dev->fmt); + if (ret < 0) { v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "Invalid image format at CCDC\n"); goto unlock_out;