From 94127095634aeb6f7265df47db856985f5b96d70 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 26 Mar 2012 10:24:50 -0300
Subject: [PATCH] --- yaml --- r: 306252 b: refs/heads/master c:
 f22926e06e1ab7aa5f5c532afa4591f3d9baf59c h: refs/heads/master v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/media/video/omap3isp/isppreview.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1f0be2d1f1ab..db7fedcdc174 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 213cf90b9ad07d40c1e7aa5781907695107fe188
+refs/heads/master: f22926e06e1ab7aa5f5c532afa4591f3d9baf59c
diff --git a/trunk/drivers/media/video/omap3isp/isppreview.c b/trunk/drivers/media/video/omap3isp/isppreview.c
index cf5014f2302d..04c96899f005 100644
--- a/trunk/drivers/media/video/omap3isp/isppreview.c
+++ b/trunk/drivers/media/video/omap3isp/isppreview.c
@@ -889,6 +889,9 @@ static int preview_config(struct isp_prev_device *prev,
 	struct preview_update *attr;
 	int i, bit, rval = 0;
 
+	if (cfg->update == 0)
+		return 0;
+
 	params = &prev->params;
 
 	if (prev->state != ISP_PIPELINE_STREAM_STOPPED) {
@@ -944,6 +947,9 @@ static void preview_setup_hw(struct isp_prev_device *prev)
 	int i, bit;
 	void *param_ptr;
 
+	if (prev->update == 0)
+		return;
+
 	for (i = 0; i < ARRAY_SIZE(update_attrs); i++) {
 		attr = &update_attrs[i];