From c9f086423c837d58190079a207646dfe9254eb90 Mon Sep 17 00:00:00 2001
From: "Lad, Prabhakar" <prabhakar.lad@ti.com>
Date: Thu, 27 Sep 2012 02:33:12 -0300
Subject: [PATCH] --- yaml --- r: 333767 b: refs/heads/master c:
 f4ad8d74e1ab54861bf084052a032c708dd0e227 h: refs/heads/master i:   333765:
 78dc7509fdc257bc0a4106c45b083a55326226d0   333763:
 bbe96ecd6e3463b2f46875c244b9b51fb5d904ee   333759:
 676d4256ee2583d7828070dae63a5b6f9d7f682d v: v3

---
 [refs]                                              |  2 +-
 trunk/drivers/media/platform/davinci/vpif_capture.c | 13 +++++++------
 trunk/drivers/media/platform/davinci/vpif_display.c | 13 +++++++------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 1a52e702def0..98de3c07239e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99b32b24889a4671244f4ef99fed779e017ce8be
+refs/heads/master: f4ad8d74e1ab54861bf084052a032c708dd0e227
diff --git a/trunk/drivers/media/platform/davinci/vpif_capture.c b/trunk/drivers/media/platform/davinci/vpif_capture.c
index 0bafecac4923..8dbbd4bffb84 100644
--- a/trunk/drivers/media/platform/davinci/vpif_capture.c
+++ b/trunk/drivers/media/platform/davinci/vpif_capture.c
@@ -311,12 +311,13 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
 	}
 
 	/* configure 1 or 2 channel mode */
-	ret = vpif_config_data->setup_input_channel_mode
-					(vpif->std_info.ycmux_mode);
-
-	if (ret < 0) {
-		vpif_dbg(1, debug, "can't set vpif channel mode\n");
-		return ret;
+	if (vpif_config_data->setup_input_channel_mode) {
+		ret = vpif_config_data->
+			setup_input_channel_mode(vpif->std_info.ycmux_mode);
+		if (ret < 0) {
+			vpif_dbg(1, debug, "can't set vpif channel mode\n");
+			return ret;
+		}
 	}
 
 	/* Call vpif_set_params function to set the parameters and addresses */
diff --git a/trunk/drivers/media/platform/davinci/vpif_display.c b/trunk/drivers/media/platform/davinci/vpif_display.c
index a5b88689abad..749368321c54 100644
--- a/trunk/drivers/media/platform/davinci/vpif_display.c
+++ b/trunk/drivers/media/platform/davinci/vpif_display.c
@@ -280,12 +280,13 @@ static int vpif_start_streaming(struct vb2_queue *vq, unsigned int count)
 	}
 
 	/* clock settings */
-	ret =
-	    vpif_config_data->set_clock(ch->vpifparams.std_info.ycmux_mode,
-					ch->vpifparams.std_info.hd_sd);
-	if (ret < 0) {
-		vpif_err("can't set clock\n");
-		return ret;
+	if (vpif_config_data->set_clock) {
+		ret = vpif_config_data->set_clock(ch->vpifparams.std_info.
+		ycmux_mode, ch->vpifparams.std_info.hd_sd);
+		if (ret < 0) {
+			vpif_err("can't set clock\n");
+			return ret;
+		}
 	}
 
 	/* set the parameters and addresses */