From 931a821a4655b85e78487702c81e90cf5752d14d Mon Sep 17 00:00:00 2001
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Date: Thu, 5 Aug 2010 19:23:44 -0300
Subject: [PATCH] --- yaml --- r: 208177 b: refs/heads/master c:
 103754a0526fe35bddbcd8ccc913495c2a66ac21 h: refs/heads/master i:   208175:
 159343ce9cf47a3f29d64f5a49ed6556fa974166 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/media/video/soc_camera.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 00d1180fcb48..ed368f0e0a84 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a484dd9b77fbbda2a79bf1b371c6d31f90e15504
+refs/heads/master: 103754a0526fe35bddbcd8ccc913495c2a66ac21
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
index f2032939fd4b..a499cacec1f3 100644
--- a/trunk/drivers/media/video/soc_camera.c
+++ b/trunk/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;