diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-22 13:46:02 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:51 -0400 |
commit | 50407f99a1fd7fcca74e53b1852dc70deb5114db (patch) | |
tree | 9c2c884af57b27e9545f56dcdfc9ad6ca462623a | |
parent | a920e42f61bdfe9974f3e2f3715d3a6d319eeaba (diff) |
V4L/DVB (7375): cx88/saa7134: fix magic number for xc3028 reusage detection
tuner-xc2028 needs to know when a DVB module is sharing the same analog tuner.
This is done by comparing a magic number that needs to be the same on analog
and on digital. To make easier, this magic number is a pointer to some data
struct.
With the previous code, two different pointers were using, causing a
miss-detection.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/video/cx88/cx88-dvb.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-dvb.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c index d72b817bf886..37ebfcc6be55 100644 --- a/drivers/media/video/cx88/cx88-dvb.c +++ b/drivers/media/video/cx88/cx88-dvb.c | |||
@@ -458,7 +458,7 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev) | |||
458 | struct xc2028_config cfg = { | 458 | struct xc2028_config cfg = { |
459 | .i2c_adap = &dev->core->i2c_adap, | 459 | .i2c_adap = &dev->core->i2c_adap, |
460 | .i2c_addr = addr, | 460 | .i2c_addr = addr, |
461 | .video_dev = dev->core, | 461 | .video_dev = dev->core->i2c_adap.algo_data, |
462 | }; | 462 | }; |
463 | 463 | ||
464 | if (!dev->dvb.frontend) { | 464 | if (!dev->dvb.frontend) { |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 97d9178dca2b..00f325ad565a 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
@@ -1166,7 +1166,7 @@ static int dvb_init(struct saa7134_dev *dev) | |||
1166 | struct xc2028_config cfg = { | 1166 | struct xc2028_config cfg = { |
1167 | .i2c_adap = &dev->i2c_adap, | 1167 | .i2c_adap = &dev->i2c_adap, |
1168 | .i2c_addr = 0x61, | 1168 | .i2c_addr = 0x61, |
1169 | .video_dev = dev, | 1169 | .video_dev = dev->i2c_adap.algo_data, |
1170 | }; | 1170 | }; |
1171 | fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg); | 1171 | fe = dvb_attach(xc2028_attach, dev->dvb.frontend, &cfg); |
1172 | if (!fe) { | 1172 | if (!fe) { |