V4L/DVB (10439): cx18: Clean-up and enable sliced VBI handling

Removed legacy ivtv state variables, added comments, and cleaned
up sliced VBI related code.  Enabled sliced VBI.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c
index 17edf305d649..6af4d5c190e1 100644
--- a/drivers/media/video/cx18/cx18-controls.c
+++ b/drivers/media/video/cx18/cx18-controls.c
@@ -178,8 +178,8 @@ static int cx18_setup_vbi_fmt(struct cx18 *cx, enum v4l2_mpeg_stream_vbi_fmt fmt
                 int i;
 
                 for (i = 0; i < CX18_VBI_FRAMES; i++) {
-                        /* Yuck, hardcoded. Needs to be a define */
-                        cx->vbi.sliced_mpeg_data[i] = kmalloc(2049, GFP_KERNEL);
+                        cx->vbi.sliced_mpeg_data[i] =
+                               kmalloc(CX18_SLICED_MPEG_DATA_BUFSZ, GFP_KERNEL);
                         if (cx->vbi.sliced_mpeg_data[i] == NULL) {
                                 while (--i >= 0) {
                                         kfree(cx->vbi.sliced_mpeg_data[i]);