1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 099d5df8c572..87f77a34eeab 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -33,6 +33,7 @@
 #include <media/saa7115.h>
 #include <media/tvp5150.h>
 #include <media/tvaudio.h>
+#include <media/mt9v011.h>
 #include <media/i2c-addr.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
@@ -1917,11 +1918,6 @@ static unsigned short tvp5150_addrs[] = {
         I2C_CLIENT_END
 };
 
-static unsigned short mt9v011_addrs[] = {
-        0xba >> 1,
-        I2C_CLIENT_END
-};
-
 static unsigned short msp3400_addrs[] = {
         0x80 >> 1,
         0x88 >> 1,
@@ -2437,6 +2433,7 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
                 dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
                 dev->init_data.get_key = em28xx_get_key_em_haup;
                 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
+                break;
         case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
                 dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;
                 dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
@@ -2623,11 +2620,17 @@ void em28xx_card_setup(struct em28xx *dev)
                         "tvp5150", 0, tvp5150_addrs);
 
         if (dev->em28xx_sensor == EM28XX_MT9V011) {
+                struct mt9v011_platform_data pdata;
+                struct i2c_board_info mt9v011_info = {
+                        .type = "mt9v011",
+                        .addr = 0xba >> 1,
+                        .platform_data = &pdata,
+                };
                 struct v4l2_subdev *sd;
 
-                sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
-                         &dev->i2c_adap, "mt9v011", 0, mt9v011_addrs);
-                v4l2_subdev_call(sd, core, s_config, 0, &dev->sensor_xtal);
+                pdata.xtal = dev->sensor_xtal;
+                sd = v4l2_i2c_new_subdev_board(&dev->v4l2_dev, &dev->i2c_adap,
+                                &mt9v011_info, NULL);
         }