aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx25840/cx25840-vbi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-vbi.c')
-rw-r--r--drivers/media/video/cx25840/cx25840-vbi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx25840/cx25840-vbi.c b/drivers/media/video/cx25840/cx25840-vbi.c
index f5784589b27..57feca288d2 100644
--- a/drivers/media/video/cx25840/cx25840-vbi.c
+++ b/drivers/media/video/cx25840/cx25840-vbi.c
@@ -152,7 +152,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
152 case VIDIOC_G_FMT: 152 case VIDIOC_G_FMT:
153 { 153 {
154 static u16 lcr2vbi[] = { 154 static u16 lcr2vbi[] = {
155 0, V4L2_SLICED_TELETEXT_PAL_B, 0, /* 1 */ 155 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */
156 0, V4L2_SLICED_WSS_625, 0, /* 4 */ 156 0, V4L2_SLICED_WSS_625, 0, /* 4 */
157 V4L2_SLICED_CAPTION_525, /* 6 */ 157 V4L2_SLICED_CAPTION_525, /* 6 */
158 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ 158 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */
@@ -232,7 +232,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
232 for (i = 7; i <= 23; i++) { 232 for (i = 7; i <= 23; i++) {
233 for (x = 0; x <= 1; x++) { 233 for (x = 0; x <= 1; x++) {
234 switch (svbi->service_lines[1-x][i]) { 234 switch (svbi->service_lines[1-x][i]) {
235 case V4L2_SLICED_TELETEXT_PAL_B: 235 case V4L2_SLICED_TELETEXT_B:
236 lcr[i] |= 1 << (4 * x); 236 lcr[i] |= 1 << (4 * x);
237 break; 237 break;
238 case V4L2_SLICED_WSS_625: 238 case V4L2_SLICED_WSS_625:
@@ -283,7 +283,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg)
283 283
284 switch (id2) { 284 switch (id2) {
285 case 1: 285 case 1:
286 id2 = V4L2_SLICED_TELETEXT_PAL_B; 286 id2 = V4L2_SLICED_TELETEXT_B;
287 break; 287 break;
288 case 4: 288 case 4:
289 id2 = V4L2_SLICED_WSS_625; 289 id2 = V4L2_SLICED_WSS_625;