1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index f0ac62c5dc83..68068c6d0987 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -299,7 +299,7 @@ static int cx23885_set_tvnorm(struct cx23885_dev *dev, v4l2_std_id norm)
 
         dev->tvnorm = norm;
 
-        call_all(dev, tuner, s_std, norm);
+        call_all(dev, core, s_std, norm);
 
         return 0;
 }
@@ -393,9 +393,6 @@ static void res_free(struct cx23885_dev *dev, struct cx23885_fh *fh,
 
 static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
 {
-        struct v4l2_routing route;
-        memset(&route, 0, sizeof(route));
-
         dprintk(1, "%s() video_mux: %d [vmux=%d, gpio=0x%x,0x%x,0x%x,0x%x]\n",
                 __func__,
                 input, INPUT(input)->vmux,
@@ -403,10 +400,9 @@ static int cx23885_video_mux(struct cx23885_dev *dev, unsigned int input)
                 INPUT(input)->gpio2, INPUT(input)->gpio3);
         dev->input = input;
 
-        route.input = INPUT(input)->vmux;
-
         /* Tell the internal A/V decoder */
-        v4l2_subdev_call(dev->sd_cx25840, video, s_routing, &route);
+        v4l2_subdev_call(dev->sd_cx25840, video, s_routing,
+                        INPUT(input)->vmux, 0, 0);
 
         return 0;
 }
@@ -1523,10 +1519,12 @@ int cx23885_video_register(struct cx23885_dev *dev)
                 struct v4l2_subdev *sd = NULL;
 
                 if (dev->tuner_addr)
-                        sd = v4l2_i2c_new_subdev(&dev->i2c_bus[1].i2c_adap,
+                        sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", dev->tuner_addr);
                 else
-                        sd = v4l2_i2c_new_probed_subdev(&dev->i2c_bus[1].i2c_adap,
+                        sd = v4l2_i2c_new_probed_subdev(&dev->v4l2_dev,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", "tuner", v4l2_i2c_tuner_addrs(ADDRS_TV));
                 if (sd) {
                         struct tuner_setup tun_setup;