V4L/DVB: soc-camera: prohibit S_CROP, if internal G_CROP has failed

There is no sense in trying to set cropping if we cannot get current one
from the host driver.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c
index f2032939fd4b..a499cacec1f3 100644
--- a/drivers/media/video/soc_camera.c
+++ b/drivers/media/video/soc_camera.c
@@ -779,9 +779,12 @@ static int soc_camera_s_crop(struct file *file, void *fh,
         ret = ici->ops->get_crop(icd, &current_crop);
 
         /* Prohibit window size change with initialised buffers */
-        if (icf->vb_vidq.bufs[0] && !ret &&
-            (a->c.width != current_crop.c.width ||
-             a->c.height != current_crop.c.height)) {
+        if (ret < 0) {
+                dev_err(&icd->dev,
+                        "S_CROP denied: getting current crop failed\n");
+        } else if (icf->vb_vidq.bufs[0] &&
+                   (a->c.width != current_crop.c.width ||
+                    a->c.height != current_crop.c.height)) {
                 dev_err(&icd->dev,
                         "S_CROP denied: queue initialised and sizes differ\n");
                 ret = -EBUSY;