From 6437f50d44fec33a7d6f5494776f3e9370a56ed2 Mon Sep 17 00:00:00 2001
From: Mike Isely <isely@pobox.com>
Date: Fri, 16 Jan 2009 03:06:02 -0300
Subject: [PATCH] --- yaml --- r: 137707 b: refs/heads/master c:
 2cc3b6bff46129374ee31236f804637278c5f323 h: refs/heads/master i:   137705:
 96c466bef0e3fa7dd88e695f89bd657b9b218f5f   137703:
 6a312cb3274fabb6e63f7a56f0960ada5221f8b5 v: v3

---
 [refs]                                        |  2 +-
 .../video/pvrusb2/pvrusb2-i2c-chips-v4l2.c    | 23 +++++++++++--------
 .../video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c      | 14 +++++++++++
 .../video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h      |  1 +
 .../media/video/pvrusb2/pvrusb2-i2c-core.c    |  2 +-
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f90ead47eed7..b1f8763a5503 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8ed06fd4729d25959f6af8b7ce4e3888866bfe56
+refs/heads/master: 2cc3b6bff46129374ee31236f804637278c5f323
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index 94a47718e88e..4cf980c49d01 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -31,17 +31,19 @@
 
 #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
 
-#define OP_STANDARD 0
-#define OP_AUDIOMODE 1
-#define OP_BCSH 2
-#define OP_VOLUME 3
-#define OP_FREQ 4
-#define OP_AUDIORATE 5
-#define OP_CROP 6
-#define OP_SIZE 7
-#define OP_LOG 8
+#define OP_INIT 0 /* MUST come first so it is run first */
+#define OP_STANDARD 1
+#define OP_AUDIOMODE 2
+#define OP_BCSH 3
+#define OP_VOLUME 4
+#define OP_FREQ 5
+#define OP_AUDIORATE 6
+#define OP_CROP 7
+#define OP_SIZE 8
+#define OP_LOG 9
 
 static const struct pvr2_i2c_op * const ops[] = {
+	[OP_INIT] = &pvr2_i2c_op_v4l2_init,
 	[OP_STANDARD] = &pvr2_i2c_op_v4l2_standard,
 	[OP_AUDIOMODE] = &pvr2_i2c_op_v4l2_audiomode,
 	[OP_BCSH] = &pvr2_i2c_op_v4l2_bcsh,
@@ -56,7 +58,8 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
 {
 	int id;
 	id = cp->client->driver->id;
-	cp->ctl_mask = ((1 << OP_STANDARD) |
+	cp->ctl_mask = ((1 << OP_INIT) |
+			(1 << OP_STANDARD) |
 			(1 << OP_AUDIOMODE) |
 			(1 << OP_BCSH) |
 			(1 << OP_VOLUME) |
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
index 16bb11902a52..0f2885440f2f 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.c
@@ -25,6 +25,20 @@
 #include <linux/videodev2.h>
 #include <media/v4l2-common.h>
 
+static void execute_init(struct pvr2_hdw *hdw)
+{
+	u32 dummy = 0;
+	pvr2_trace(PVR2_TRACE_CHIPS, "i2c v4l2 init");
+	pvr2_i2c_core_cmd(hdw, VIDIOC_INT_INIT, &dummy);
+}
+
+
+const struct pvr2_i2c_op pvr2_i2c_op_v4l2_init = {
+	.update = execute_init,
+	.name = "v4l2_init",
+};
+
+
 static void set_standard(struct pvr2_hdw *hdw)
 {
 	pvr2_trace(PVR2_TRACE_CHIPS,"i2c v4l2 set_standard");
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
index eb744a20610d..69a63f2a8a7b 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-cmd-v4l2.h
@@ -24,6 +24,7 @@
 
 #include "pvrusb2-i2c-core.h"
 
+extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_init;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_standard;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_radio;
 extern const struct pvr2_i2c_op pvr2_i2c_op_v4l2_bcsh;
diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
index d6a35401fefb..57a024737722 100644
--- a/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
+++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c
@@ -763,7 +763,7 @@ int pvr2_i2c_core_check_stale(struct pvr2_hdw *hdw)
 		if (!(msk & pm)) continue;
 		pm &= ~msk;
 		opf = pvr2_i2c_get_op(idx);
-		if (!opf) continue;
+		if (!(opf && opf->check)) continue;
 		if (opf->check(hdw)) {
 			sm |= msk;
 		}