diff options
| author |   Hans Verkuil <hverkuil@xs4all.nl> | 2014-12-06 07:30:03 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-16 23:21:39 -0200 |
| commit | bb9ff078860f9d2f79d3a6bea3af9f48354ddb75 (patch) | |
| tree | 8ec280a88f900b397a12d66917af32bfbb34646b /drivers/media | |
| parent | [media] DocBook media: update version number and document changes (diff) | |
| download | linux-dev-bb9ff078860f9d2f79d3a6bea3af9f48354ddb75.tar.xz linux-dev-bb9ff078860f9d2f79d3a6bea3af9f48354ddb75.zip | |
[media] vivid: fix CROP_BOUNDS typo for video output
An error was returned if composing was not supported, instead of if
cropping was not supported.
A classic copy-and-paste bug. Found with v4l2-compliance.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Cc: <stable@vger.kernel.org> # for v3.18
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/vivid/vivid-vid-out.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c index ee5c3992b276..39ff79f6aa67 100644 --- a/drivers/media/platform/vivid/vivid-vid-out.c +++ b/drivers/media/platform/vivid/vivid-vid-out.c @@ -625,7 +625,7 @@ int vivid_vid_out_g_selection(struct file *file, void *priv, sel->r = dev->fmt_out_rect; break; case V4L2_SEL_TGT_CROP_BOUNDS: - if (!dev->has_compose_out) + if (!dev->has_crop_out) return -EINVAL; sel->r = vivid_max_rect; break; |