Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c
index 25b30f352d84..59e13fdea780 100644
--- a/drivers/media/video/saa711x.c
+++ b/drivers/media/video/saa711x.c
@@ -323,7 +323,7 @@ saa711x_command (struct i2c_client *client,
 
                 case VIDEO_MODE_SECAM:
                         saa711x_write(client, 0x08,
-                                      (decoder->reg[0x0e] & 0x3f) | 0x00);
+                                      (decoder->reg[0x08] & 0x3f) | 0x00);
                         saa711x_write(client, 0x0e,
                                       (decoder->reg[0x0e] & 0x8f) | 0x50);
                         break;