---

yaml --- r: 38908 b: refs/heads/master c: 9448025 h: refs/heads/master v: v3
git-mirror · Oct 4, 2006 · c5989a0 · c5989a0
1 parent b02b6ac
commit c5989a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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;