Merge tag 'v3.8-rc1' into staging/for_v3.9

[sfrench/cifs-2.6.git] / drivers / media / usb / au0828 / au0828-i2c.c

diff --git a/drivers/media/usb/au0828/au0828-i2c.c b/drivers/media/usb/au0828/au0828-i2c.c
index 4ded17fe195792d53158e7936048213376c40e6b..20d69b5652552fd6a0dab9ee1e2e3a81d5ab2f62 100644 (file)
--- a/drivers/media/usb/au0828/au0828-i2c.c
+++ b/drivers/media/usb/au0828/au0828-i2c.c
@@ -378,7 +378,11 @@ int au0828_i2c_register(struct au0828_dev *dev)
 
        dev->i2c_adap.algo = &dev->i2c_algo;
        dev->i2c_adap.algo_data = dev;
+#ifdef CONFIG_VIDEO_AU0828_V4L2
        i2c_set_adapdata(&dev->i2c_adap, &dev->v4l2_dev);
+#else
+       i2c_set_adapdata(&dev->i2c_adap, dev);
+#endif
        i2c_add_adapter(&dev->i2c_adap);
 
        dev->i2c_client.adapter = &dev->i2c_adap;