From c34688ae8d0ee66c249525384879c1a96467cf3b Mon Sep 17 00:00:00 2001
From: Andy Walls <awalls@radix.net>
Date: Sat, 28 Feb 2009 23:06:08 -0300
Subject: [PATCH] --- yaml --- r: 138074 b: refs/heads/master c:
 cb95a40e54b96938c2e81de6a95609e915922962 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/video/cx18/cx18-av-vbi.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f7adecc996fb..3bbab1d43ae8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af7c58b1f5014bea181ef74d724ac960923dd403
+refs/heads/master: cb95a40e54b96938c2e81de6a95609e915922962
diff --git a/trunk/drivers/media/video/cx18/cx18-av-vbi.c b/trunk/drivers/media/video/cx18/cx18-av-vbi.c
index 43267d1afb92..27699839b80d 100644
--- a/trunk/drivers/media/video/cx18/cx18-av-vbi.c
+++ b/trunk/drivers/media/video/cx18/cx18-av-vbi.c
@@ -142,7 +142,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg)
 			0, V4L2_SLICED_TELETEXT_B, 0,	/* 1 */
 			0, V4L2_SLICED_WSS_625, 0,	/* 4 */
 			V4L2_SLICED_CAPTION_525,	/* 6 */
-			V4L2_SLICED_VPS, 0, 0, 0, 0,	/* 7 - unlike cx25840 */
+			0, 0, V4L2_SLICED_VPS, 0, 0,	/* 9 */
 			0, 0, 0, 0
 		};
 		int is_pal = !(state->std & V4L2_STD_525_60);
@@ -243,7 +243,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg)
 					lcr[i] |= 6 << (4 * x);
 					break;
 				case V4L2_SLICED_VPS:
-					lcr[i] |= 7 << (4 * x); /*'840 differs*/
+					lcr[i] |= 9 << (4 * x);
 					break;
 				}
 			}
@@ -301,7 +301,7 @@ int cx18_av_vbi(struct cx18 *cx, unsigned int cmd, void *arg)
 			sdid = V4L2_SLICED_CAPTION_525;
 			err = !odd_parity(p[0]) || !odd_parity(p[1]);
 			break;
-		case 7: /* Differs from cx25840 */
+		case 9:
 			sdid = V4L2_SLICED_VPS;
 			if (decode_vps(p, p) != 0)
 				err = 1;