V4L/DVB (11373): v4l2-common: add explicit v4l2_device pointer as first arg to new_(probed)_subdev

The functions v4l2_i2c_new_subdev and v4l2_i2c_new_probed_subdev relied on
i2c_get_adapdata to return the v4l2_device. However, this is not always
possible on embedded platforms. So modify the API to pass the v4l2_device
pointer explicitly.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index f91bba435ed..1ef70b090c4 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1360,11 +1360,13 @@ static int __devinit zoran_probe(struct pci_dev *pdev,
                 goto zr_free_irq;
         }
 
-        zr->decoder = v4l2_i2c_new_probed_subdev(&zr->i2c_adapter,
-                zr->card.mod_decoder, zr->card.i2c_decoder, zr->card.addrs_decoder);
+        zr->decoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+                &zr->i2c_adapter, zr->card.mod_decoder, zr->card.i2c_decoder,
+                zr->card.addrs_decoder);
 
         if (zr->card.mod_encoder)
-                zr->encoder = v4l2_i2c_new_probed_subdev(&zr->i2c_adapter,
+                zr->encoder = v4l2_i2c_new_probed_subdev(&zr->v4l2_dev,
+                        &zr->i2c_adapter,
                         zr->card.mod_encoder, zr->card.i2c_encoder,
                         zr->card.addrs_encoder);