diff options
author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-12-02 20:50:47 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-12-21 11:22:30 -0500 |
commit | e276f03b4f29fcc54d8e658d5de8dd953e4aef1e (patch) | |
tree | d341ec9fc1a25fafabd77845f3a6d32de0b12805 /drivers/media/platform/davinci | |
parent | 4d22f1086d24f61e271e1e84c0c27db4ad495e8f (diff) |
[media] media: davinci: vpbe: return error code on error in vpbe_display_g_crop()
We have assigned error code to 'ret' if crop->type is not
V4L2_BUF_TYPE_VIDEO_OUTPUT, but never use it.
We'd better return the error code on this error.
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Acked-by: Prabhakar Lad <prabhakar.lad@ti.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/platform/davinci')
-rw-r--r-- | drivers/media/platform/davinci/vpbe_display.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c index 0723c4694ced..d078738b35d6 100644 --- a/drivers/media/platform/davinci/vpbe_display.c +++ b/drivers/media/platform/davinci/vpbe_display.c | |||
@@ -791,7 +791,6 @@ static int vpbe_display_g_crop(struct file *file, void *priv, | |||
791 | struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev; | 791 | struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev; |
792 | struct osd_state *osd_device = fh->disp_dev->osd_device; | 792 | struct osd_state *osd_device = fh->disp_dev->osd_device; |
793 | struct v4l2_rect *rect = &crop->c; | 793 | struct v4l2_rect *rect = &crop->c; |
794 | int ret; | ||
795 | 794 | ||
796 | v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, | 795 | v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, |
797 | "VIDIOC_G_CROP, layer id = %d\n", | 796 | "VIDIOC_G_CROP, layer id = %d\n", |
@@ -799,7 +798,7 @@ static int vpbe_display_g_crop(struct file *file, void *priv, | |||
799 | 798 | ||
800 | if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) { | 799 | if (crop->type != V4L2_BUF_TYPE_VIDEO_OUTPUT) { |
801 | v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buf type\n"); | 800 | v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buf type\n"); |
802 | ret = -EINVAL; | 801 | return -EINVAL; |
803 | } | 802 | } |
804 | osd_device->ops.get_layer_config(osd_device, | 803 | osd_device->ops.get_layer_config(osd_device, |
805 | layer->layer_info.id, cfg); | 804 | layer->layer_info.id, cfg); |