summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/zoran_card.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-02-23 16:54:56 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-23 16:54:56 -0200
commit2d65658078459d35572e637c8cb1b6fc3826f12a (patch)
treee18d3f1e0e68c693a727e429934e42af169a2853 /linux/drivers/media/video/zoran_card.c
parentb64c80be829fbeb8b936ca6d61a59013d8ad2bba (diff)
parentcc88074b4da7cb25b8c2bc93f41434cfc1763924 (diff)
downloadmediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.gz
mediapointer-dvb-s2-2d65658078459d35572e637c8cb1b6fc3826f12a.tar.bz2
merge: http://linuxtv.org/hg/~mrechberger/v4l-dvb-cx88
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/zoran_card.c')
-rw-r--r--linux/drivers/media/video/zoran_card.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/linux/drivers/media/video/zoran_card.c b/linux/drivers/media/video/zoran_card.c
index f453a2b96..498e37e9f 100644
--- a/linux/drivers/media/video/zoran_card.c
+++ b/linux/drivers/media/video/zoran_card.c
@@ -846,6 +846,7 @@ zoran_register_i2c (struct zoran *zr)
sizeof(I2C_NAME(&zr->i2c_adapter)) - 1);
i2c_set_adapdata(&zr->i2c_adapter, zr);
zr->i2c_adapter.algo_data = &zr->i2c_algo;
+ zr->i2c_adapter.dev.parent = &zr->pci_dev->dev;
return i2c_bit_add_bus(&zr->i2c_adapter);
}