From c5989a07059571eab4ee05e0b9b6ebc7074aac68 Mon Sep 17 00:00:00 2001
From: Hartmut Hackmann <hartmut.hackmann@t-online.de>
Date: Mon, 2 Oct 2006 21:00:32 -0300
Subject: [PATCH] --- yaml --- r: 38908 b: refs/heads/master c:
 9448025be057f6b64c4bab01894c8e6b1a406e6e h: refs/heads/master v: v3

---
 [refs]                                            | 2 +-
 trunk/drivers/media/video/saa7134/saa7134-video.c | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 352a06f085e0..2d777072a77d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf146ca4c2d56f275235526d9ada6c007313c7c7
+refs/heads/master: 9448025be057f6b64c4bab01894c8e6b1a406e6e
diff --git a/trunk/drivers/media/video/saa7134/saa7134-video.c b/trunk/drivers/media/video/saa7134/saa7134-video.c
index 557530aef946..203302f21827 100644
--- a/trunk/drivers/media/video/saa7134/saa7134-video.c
+++ b/trunk/drivers/media/video/saa7134/saa7134-video.c
@@ -1820,15 +1820,18 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
 					break;
 		if (i == TVNORMS)
 			return -EINVAL;
-		if (*id & V4L2_STD_SECAM) {
-			if (secam[0] == 'L' || secam[0] == 'l')
+		if ((*id & V4L2_STD_SECAM) && (secam[0] != '-')) {
+			if (secam[0] == 'L' || secam[0] == 'l') {
 				if (secam[1] == 'C' || secam[1] == 'c')
 					fixup = V4L2_STD_SECAM_LC;
 				else
 					fixup = V4L2_STD_SECAM_L;
-			else
+			} else {
 				if (secam[0] == 'D' || secam[0] == 'd')
 					fixup = V4L2_STD_SECAM_DK;
+				else
+					fixup = V4L2_STD_SECAM;
+			}
 			for (i = 0; i < TVNORMS; i++)
 				if (fixup == tvnorms[i].id)
 					break;