diff options
| author | Markus Rechberger <mrechberger@gmail.com> | 2005-11-08 21:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 07:56:17 -0800 |
| commit | a9ae9fb17bdcb22ae0c1abc6ebd97704dd80d9d1 (patch) | |
| tree | 6af14213d06c84f3ee806fef638a46e23c3ebc82 /drivers/media | |
| parent | 18f47d10bc8076bb126a1a369b782e29cc91c824 (diff) | |
[PATCH] v4l: 761: fixed registry value in em2820
- Fixed registry value in em2820-i2c.c which corrects a tuner setting (also
removed that call from em2820-video.c)
Signed-off-by: Markus Rechberger <mrechberger@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-i2c.c | 40 | ||||
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 1 |
2 files changed, 20 insertions, 21 deletions
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index 150c72bb6e4..8551998dbae 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/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/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index 3581fc4c874..7e4114ea15f 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c @@ -225,7 +225,6 @@ void em2820_config_i2c(struct em2820 *dev) /* configure tda9887 */ - em2820_i2c_call_clients(dev, TDA9887_SET_CONFIG, &dev->tda9887_conf); /* em2820_i2c_call_clients(dev,VIDIOC_S_STD,&dev->tvnorm->id); */ } |