aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorAndy Walls <awalls@md.metrocast.net>2010-07-18 16:35:00 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-08 22:42:54 -0400
commitebbeb46000676af0772da4b7da22e2aae3889bd0 (patch)
tree61e7dd6d3f1c60f8d4041c15829bf6f78f97afb8 /drivers/media
parent5f272644464bfb8cf8cec958cfc06020283c2f14 (diff)
V4L/DVB: cx23885: Add correct detection of the HVR-1250 model 79501
The offset in the eeprom data for the 79501 version of the HVR-1250 is at 0xc0 vs. the standard 0x80. Signed-off-by: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 2014daedee8b..29eea8d3613b 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -626,6 +626,9 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data)
626 case 79101: 626 case 79101:
627 /* WinTV-HVR1250 (PCIe, Retail, IR, half height, 627 /* WinTV-HVR1250 (PCIe, Retail, IR, half height,
628 ATSC and Basic analog */ 628 ATSC and Basic analog */
629 case 79501:
630 /* WinTV-HVR1250 (PCIe, No IR, half height,
631 ATSC [at least] and Basic analog) */
629 case 79561: 632 case 79561:
630 /* WinTV-HVR1250 (PCIe, OEM, No IR, half height, 633 /* WinTV-HVR1250 (PCIe, OEM, No IR, half height,
631 ATSC and Basic analog */ 634 ATSC and Basic analog */
@@ -1028,6 +1031,13 @@ void cx23885_card_setup(struct cx23885_dev *dev)
1028 1031
1029 switch (dev->board) { 1032 switch (dev->board) {
1030 case CX23885_BOARD_HAUPPAUGE_HVR1250: 1033 case CX23885_BOARD_HAUPPAUGE_HVR1250:
1034 if (dev->i2c_bus[0].i2c_rc == 0) {
1035 if (eeprom[0x80] != 0x84)
1036 hauppauge_eeprom(dev, eeprom+0xc0);
1037 else
1038 hauppauge_eeprom(dev, eeprom+0x80);
1039 }
1040 break;
1031 case CX23885_BOARD_HAUPPAUGE_HVR1500: 1041 case CX23885_BOARD_HAUPPAUGE_HVR1500:
1032 case CX23885_BOARD_HAUPPAUGE_HVR1500Q: 1042 case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
1033 case CX23885_BOARD_HAUPPAUGE_HVR1400: 1043 case CX23885_BOARD_HAUPPAUGE_HVR1400: