diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-19 07:04:16 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-19 07:04:16 -0300 |
commit | e3a620022ff190fda2954e1e2c7b83d0aff8ef1b (patch) | |
tree | 5a4525247af55376d185ef411c295e0436f13349 /linux/drivers/media/video/cx23885/cx23885-core.c | |
parent | fafa73afff3347cd279b9db9f82bf9e8f2751401 (diff) | |
parent | 028b650ff39328bbebc163ce60dfd72051ef0d9f (diff) | |
download | mediapointer-dvb-s2-e3a620022ff190fda2954e1e2c7b83d0aff8ef1b.tar.gz mediapointer-dvb-s2-e3a620022ff190fda2954e1e2c7b83d0aff8ef1b.tar.bz2 |
merge: http://linuxtv.org/hg/~stoth/hvr1200
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-core.c')
-rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-core.c b/linux/drivers/media/video/cx23885/cx23885-core.c index 309c17586..968b31716 100644 --- a/linux/drivers/media/video/cx23885/cx23885-core.c +++ b/linux/drivers/media/video/cx23885/cx23885-core.c @@ -745,8 +745,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev) cx23885_i2c_register(&dev->i2c_bus[0]); cx23885_i2c_register(&dev->i2c_bus[1]); cx23885_i2c_register(&dev->i2c_bus[2]); - cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); cx23885_card_setup(dev); + cx23885_call_i2c_clients (&dev->i2c_bus[0], TUNER_SET_STANDBY, NULL); cx23885_ir_init(dev); if (cx23885_boards[dev->board].porta == CX23885_ANALOG_VIDEO) { |