From 3320237d466a7e281f96193f487429d267f7cf4a Mon Sep 17 00:00:00 2001
From: Stefan Ringel <stefan.ringel@arcor.de>
Date: Wed, 27 Oct 2010 16:48:05 -0300
Subject: [PATCH] --- yaml --- r: 222064 b: refs/heads/master c:
 4f52610e290eb6bf63522b0dad886ac88c7623cd h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/tm6000/tm6000-video.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f3c2fe6f223e..4e45e38ec031 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 399d84655648b052c03301a71caa33758d906c2e
+refs/heads/master: 4f52610e290eb6bf63522b0dad886ac88c7623cd
diff --git a/trunk/drivers/staging/tm6000/tm6000-video.c b/trunk/drivers/staging/tm6000/tm6000-video.c
index 9ec82796634e..c5690b2a8924 100644
--- a/trunk/drivers/staging/tm6000/tm6000-video.c
+++ b/trunk/drivers/staging/tm6000/tm6000-video.c
@@ -1032,6 +1032,7 @@ static int vidioc_s_std (struct file *file, void *priv, v4l2_std_id *norm)
 	struct tm6000_fh   *fh=priv;
 	struct tm6000_core *dev = fh->dev;
 
+	dev->norm = *norm;
 	rc = tm6000_init_analog_mode(dev);
 
 	fh->width  = dev->width;