aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bttv-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-09-09 16:04:05 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 16:57:54 -0400
commit0f97a931b337e4662e736ca67f1fab0a187f5852 (patch)
tree974a24348db544ed76e1fea0efda68e0c486f789 /drivers/media/video/bttv-cards.c
parent18fc59e230bbda9725736f8f526ef88aab212348 (diff)
[PATCH] v4l: tveeprom improved to support newer Hauppage cards
- tveeprom improved and updated to reflect newer Hauppage cards. - CodingStyle fixes. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> 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/video/bttv-cards.c')
-rw-r--r--drivers/media/video/bttv-cards.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 10ab12ba4c6d..190977a1e549 100644
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -3060,7 +3060,7 @@ static void __devinit hauppauge_eeprom(struct bttv *btv)
3060{ 3060{
3061 struct tveeprom tv; 3061 struct tveeprom tv;
3062 3062
3063 tveeprom_hauppauge_analog(&tv, eeprom_data); 3063 tveeprom_hauppauge_analog(&btv->i2c_client, &tv, eeprom_data);
3064 btv->tuner_type = tv.tuner_type; 3064 btv->tuner_type = tv.tuner_type;
3065 btv->has_radio = tv.has_radio; 3065 btv->has_radio = tv.has_radio;
3066} 3066}
@@ -4485,6 +4485,7 @@ void __devinit bttv_check_chipset(void)
4485 } 4485 }
4486 if (UNSET != latency) 4486 if (UNSET != latency)
4487 printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency); 4487 printk(KERN_INFO "bttv: pci latency fixup [%d]\n",latency);
4488
4488 while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL, 4489 while ((dev = pci_find_device(PCI_VENDOR_ID_INTEL,
4489 PCI_DEVICE_ID_INTEL_82441, dev))) { 4490 PCI_DEVICE_ID_INTEL_82441, dev))) {
4490 unsigned char b; 4491 unsigned char b;