diff options
Diffstat (limited to 'drivers/media/video/cx25840/cx25840-vbi.c')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-vbi.c | 6 |
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 04d879da7d63..e96fd1f1d6dc 100644 --- a/drivers/media/video/cx25840/cx25840-vbi.c +++ b/drivers/media/video/cx25840/cx25840-vbi.c | |||
@@ -151,7 +151,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) | |||
151 | case VIDIOC_G_FMT: | 151 | case VIDIOC_G_FMT: |
152 | { | 152 | { |
153 | static u16 lcr2vbi[] = { | 153 | static u16 lcr2vbi[] = { |
154 | 0, V4L2_SLICED_TELETEXT_B, 0, /* 1 */ | 154 | 0, V4L2_SLICED_TELETEXT_PAL_B, 0, /* 1 */ |
155 | 0, V4L2_SLICED_WSS_625, 0, /* 4 */ | 155 | 0, V4L2_SLICED_WSS_625, 0, /* 4 */ |
156 | V4L2_SLICED_CAPTION_525, /* 6 */ | 156 | V4L2_SLICED_CAPTION_525, /* 6 */ |
157 | 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ | 157 | 0, 0, V4L2_SLICED_VPS, 0, 0, /* 9 */ |
@@ -231,7 +231,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) | |||
231 | for (i = 7; i <= 23; i++) { | 231 | for (i = 7; i <= 23; i++) { |
232 | for (x = 0; x <= 1; x++) { | 232 | for (x = 0; x <= 1; x++) { |
233 | switch (svbi->service_lines[1-x][i]) { | 233 | switch (svbi->service_lines[1-x][i]) { |
234 | case V4L2_SLICED_TELETEXT_B: | 234 | case V4L2_SLICED_TELETEXT_PAL_B: |
235 | lcr[i] |= 1 << (4 * x); | 235 | lcr[i] |= 1 << (4 * x); |
236 | break; | 236 | break; |
237 | case V4L2_SLICED_WSS_625: | 237 | case V4L2_SLICED_WSS_625: |
@@ -282,7 +282,7 @@ int cx25840_vbi(struct i2c_client *client, unsigned int cmd, void *arg) | |||
282 | 282 | ||
283 | switch (id2) { | 283 | switch (id2) { |
284 | case 1: | 284 | case 1: |
285 | id2 = V4L2_SLICED_TELETEXT_B; | 285 | id2 = V4L2_SLICED_TELETEXT_PAL_B; |
286 | break; | 286 | break; |
287 | case 4: | 287 | case 4: |
288 | id2 = V4L2_SLICED_WSS_625; | 288 | id2 = V4L2_SLICED_WSS_625; |