diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-20 09:46:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-20 09:46:42 +0200 |
| commit | 4fffe71dd913cca5532da594e2f48a0db6b494dc (patch) | |
| tree | 6e0dc83582382506e8b70760d8b59a50d93bfa5a /drivers/media/v4l2-core/v4l2-ioctl.c | |
| parent | 4b3b234f434d440fcd749b9636131b76e2ce561e (diff) | |
| parent | 47ef4ad2684d380dd6d596140fb79395115c3950 (diff) | |
| download | linux-4fffe71dd913cca5532da594e2f48a0db6b494dc.tar.gz linux-4fffe71dd913cca5532da594e2f48a0db6b494dc.tar.xz | |
Merge branch 'linus' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ioctl.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 28e5be2c2eef..528390f33b53 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c @@ -2171,7 +2171,7 @@ static int v4l_cropcap(const struct v4l2_ioctl_ops *ops, * The determine_valid_ioctls() call already should ensure * that this can never happen, but just in case... */ - if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_cropcap)) + if (WARN_ON(!ops->vidioc_cropcap && !ops->vidioc_g_selection)) return -ENOTTY; if (ops->vidioc_cropcap) |