1 files changed, 19 insertions, 11 deletions

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index b1c3cbd92743..b988ec62af58 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -36,6 +36,7 @@
 #include "cx18-scb.h"
 #include "cx18-mailbox.h"
 #include "cx18-ioctl.h"
+#include "cx18-controls.h"
 #include "tuner-xc2028.h"
 
 #include <media/tveeprom.h>
@@ -729,15 +730,21 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
         cx->open_id = 1;
 
         /* Initial settings */
-        cx2341x_fill_defaults(&cx->params);
-        cx->temporal_strength = cx->params.video_temporal_filter;
-        cx->spatial_strength = cx->params.video_spatial_filter;
-        cx->filter_mode = cx->params.video_spatial_filter_mode |
-                (cx->params.video_temporal_filter_mode << 1) |
-                (cx->params.video_median_filter_type << 2);
-        cx->params.port = CX2341X_PORT_MEMORY;
-        cx->params.capabilities =
-                                CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
+        cx->cxhdl.port = CX2341X_PORT_MEMORY;
+        cx->cxhdl.capabilities = CX2341X_CAP_HAS_TS | CX2341X_CAP_HAS_SLICED_VBI;
+        cx->cxhdl.ops = &cx18_cxhdl_ops;
+        cx->cxhdl.func = cx18_api_func;
+        ret = cx2341x_handler_init(&cx->cxhdl, 50);
+        if (ret)
+                return ret;
+        cx->v4l2_dev.ctrl_handler = &cx->cxhdl.hdl;
+
+        cx->temporal_strength = cx->cxhdl.video_temporal_filter->cur.val;
+        cx->spatial_strength = cx->cxhdl.video_spatial_filter->cur.val;
+        cx->filter_mode = cx->cxhdl.video_spatial_filter_mode->cur.val |
+                (cx->cxhdl.video_temporal_filter_mode->cur.val << 1) |
+                (cx->cxhdl.video_median_filter_type->cur.val << 2);
+
         init_waitqueue_head(&cx->cap_w);
         init_waitqueue_head(&cx->mb_apu_waitq);
         init_waitqueue_head(&cx->mb_cpu_waitq);
@@ -1049,7 +1056,7 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
         else
                 cx->is_50hz = 1;
 
-        cx->params.video_gop_size = cx->is_60hz ? 15 : 12;
+        cx2341x_handler_set_50hz(&cx->cxhdl, !cx->is_60hz);
 
         if (cx->options.radio > 0)
                 cx->v4l2_cap |= V4L2_CAP_RADIO;
@@ -1095,7 +1102,6 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
 
         /* Load cx18 submodules (cx18-alsa) */
         request_modules(cx);
-
         return 0;
 
 free_streams:
@@ -1278,6 +1284,8 @@ static void cx18_remove(struct pci_dev *pci_dev)
                 for (i = 0; i < CX18_VBI_FRAMES; i++)
                         kfree(cx->vbi.sliced_mpeg_data[i]);
 
+        v4l2_ctrl_handler_free(&cx->av_state.hdl);
+
         CX18_INFO("Removed %s\n", cx->card_name);
 
         v4l2_device_unregister(v4l2_dev);