From 46563f9d8b9f2e9d020bc5dc67f13dbd9da94272 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 14 Jul 2009 03:14:21 -0300
Subject: [PATCH] --- yaml --- r: 155775 b: refs/heads/master c:
 2ea472ff704a8a94b3b9abec438db23e512be337 h: refs/heads/master i:   155773:
 40ae03dadbee188ee991173af917544f56d76da2   155771:
 a62cb5331ff5fced5d0255fd7aa533a5e0003e68   155767:
 0a970057dd3ff5bc6543eddb44eb0a51d8e8a417   155759:
 4efbffe8e3da599756444fbf6bfe9c20fc91f891   155743:
 15da71c51e0d28929e215a543aa4863843ccf91c   155711:
 8fbcd45ebd37f9ac878b67b607af8aa10ded8892   155647:
 c683d114eece7293db1b0163ade0c4c92c09f93d v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/mt9v011.c | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e86754eac016..4d1c1309f22d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c180604a87c5abb0a117998009d01a4499d58653
+refs/heads/master: 2ea472ff704a8a94b3b9abec438db23e512be337
diff --git a/trunk/drivers/media/video/mt9v011.c b/trunk/drivers/media/video/mt9v011.c
index d7b15dd836e6..b2260de645f0 100644
--- a/trunk/drivers/media/video/mt9v011.c
+++ b/trunk/drivers/media/video/mt9v011.c
@@ -340,6 +340,22 @@ static int mt9v011_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *fmt)
 	return 0;
 }
 
+static int mt9v011_s_config(struct v4l2_subdev *sd, int dumb, void *data)
+{
+	struct mt9v011 *core = to_mt9v011(sd);
+	unsigned *xtal = data;
+
+	v4l2_dbg(1, debug, sd, "s_config called\n");
+
+	if (xtal) {
+		core->xtal = *xtal;
+		v4l2_dbg(1, debug, sd, "xtal set to %d.%03d MHz\n",
+			 *xtal / 1000000, (*xtal / 1000) % 1000);
+	}
+
+	return 0;
+}
+
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int mt9v011_g_register(struct v4l2_subdev *sd,
@@ -388,6 +404,7 @@ static const struct v4l2_subdev_core_ops mt9v011_core_ops = {
 	.g_ctrl = mt9v011_g_ctrl,
 	.s_ctrl = mt9v011_s_ctrl,
 	.reset = mt9v011_reset,
+	.s_config = mt9v011_s_config,
 	.g_chip_ident = mt9v011_g_chip_ident,
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 	.g_register = mt9v011_g_register,