From c23b28b37f3fc66c05ec656d72e17258ee5a65d7 Mon Sep 17 00:00:00 2001
From: "Ronald S. Bultje" <rbultje@ronald.bitfreak.net>
Date: Sun, 16 Oct 2005 20:29:25 -0700
Subject: [PATCH] --- yaml --- r: 9906 b: refs/heads/master c:
 de21eb63add932c61e018d20a760dcaed8c3e40c h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/drivers/media/video/vpx3220.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ace0ef8c4ff..0df5182abdcb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b3acc21d7677787ef456d17574a084a1c1193ae
+refs/heads/master: de21eb63add932c61e018d20a760dcaed8c3e40c
diff --git a/trunk/drivers/media/video/vpx3220.c b/trunk/drivers/media/video/vpx3220.c
index 2bafca45c084..137b58f2c666 100644
--- a/trunk/drivers/media/video/vpx3220.c
+++ b/trunk/drivers/media/video/vpx3220.c
@@ -408,6 +408,12 @@ vpx3220_command (struct i2c_client *client,
 	case DECODER_SET_NORM:
 	{
 		int *iarg = arg, data;
+		int temp_input;
+
+		/* Here we back up the input selection because it gets
+		   overwritten when we fill the registers with the
+                   choosen video norm */
+		temp_input = vpx3220_fp_read(client, 0xf2);
 
 		dprintk(1, KERN_DEBUG "%s: DECODER_SET_NORM %d\n",
 			I2C_NAME(client), *iarg);
@@ -447,6 +453,10 @@ vpx3220_command (struct i2c_client *client,
 
 		}
 		decoder->norm = *iarg;
+
+		/* And here we set the backed up video input again */
+		vpx3220_fp_write(client, 0xf2, temp_input | 0x0010);
+		udelay(10);
 	}
 		break;