summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
authorMarkus Rechberger <devnull@localhost>2005-10-10 22:30:20 +0000
committerMarkus Rechberger <devnull@localhost>2005-10-10 22:30:20 +0000
commitbe0f6220f923cb5e25e59785a330bbb8a27bef3e (patch)
treed0c1e1970b03a063cb7dcc84242f8b794eb517c7 /linux/drivers/media/video
parent7face9a229067fa73bcc6e157acfb3b12d226156 (diff)
downloadmediapointer-dvb-s2-be0f6220f923cb5e25e59785a330bbb8a27bef3e.tar.gz
mediapointer-dvb-s2-be0f6220f923cb5e25e59785a330bbb8a27bef3e.tar.bz2
fixed registry value in em2820-i2c.c which corrects a tuner setting (also removed that call from em2820-video.c)
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-i2c.c40
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c2
2 files changed, 22 insertions, 20 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-i2c.c b/linux/drivers/media/video/em28xx/em28xx-i2c.c
index ae794bdee..d7f08fb79 100644
--- a/linux/drivers/media/video/em28xx/em28xx-i2c.c
+++ b/linux/drivers/media/video/em28xx/em28xx-i2c.c
@@ -302,26 +302,26 @@ static int attach_inform(struct i2c_client *client)
dprintk("address %x", client->addr << 1);
switch (client->addr << 1) {
- case 0x68:
- em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
- break;
- case 0x4a:
- dprintk1("attach_inform: saa7113 detected.\n");
- break;
- case 0xa0:
- dprintk1("attach_inform: eeprom detected.\n");
- break;
- case 0x80:
- case 0x88:
- dprintk1("attach_inform: msp34xx detected.\n");
- break;
- case 0xb8:
- case 0xba:
- dprintk1("attach_inform: tvp5150 detected.\n");
- break;
- default:
- dev->tuner_addr = client->addr;
- em2820_set_tuner(-1, client);
+ case 0x86:
+ em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
+ break;
+ case 0x4a:
+ dprintk1("attach_inform: saa7113 detected.\n");
+ break;
+ case 0xa0:
+ dprintk1("attach_inform: eeprom detected.\n");
+ break;
+ case 0x80:
+ case 0x88:
+ dprintk1("attach_inform: msp34xx detected.\n");
+ break;
+ case 0xb8:
+ case 0xba:
+ dprintk1("attach_inform: tvp5150 detected.\n");
+ break;
+ default:
+ dev->tuner_addr = client->addr;
+ em2820_set_tuner(-1, client);
}
return 0;
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index eddabdd00..be3caad98 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -275,7 +275,9 @@ void em2820_config_i2c(struct em2820 *dev)
/* configure tda9887 */
+#if 0
em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf);
+#endif
/* em2820_i2c_call_clients(dev,VIDIOC_S_STD,&dev->tvnorm->id); */
}