diff options
author | Steven Toth <stoth@hauppauge.com> | 2008-03-29 16:36:09 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-01 18:35:45 -0400 |
commit | c88133ecb3db2e3779d897abca960c450623a2a2 (patch) | |
tree | bfc6978c9a64dbfa1299a55d8f6251a109d3b690 /drivers/media | |
parent | 31c8cc9742daa6ffedf7ba8a9bc465b10dee4b52 (diff) |
V4L/DVB (7465): Fix eeprom parsing and errors on the HVR1800 products
On some models, the valid Hauppauge eeprom data begins at a different offset.
This patch avoid unfriendly 'corrupt' eeprom errors during driver load.
Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx23885/cx23885-cards.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c index 2d414dad5c31..761ad4fcece3 100644 --- a/drivers/media/video/cx23885/cx23885-cards.c +++ b/drivers/media/video/cx23885/cx23885-cards.c | |||
@@ -347,10 +347,13 @@ void cx23885_card_setup(struct cx23885_dev *dev) | |||
347 | case CX23885_BOARD_HAUPPAUGE_HVR1250: | 347 | case CX23885_BOARD_HAUPPAUGE_HVR1250: |
348 | case CX23885_BOARD_HAUPPAUGE_HVR1500: | 348 | case CX23885_BOARD_HAUPPAUGE_HVR1500: |
349 | case CX23885_BOARD_HAUPPAUGE_HVR1500Q: | 349 | case CX23885_BOARD_HAUPPAUGE_HVR1500Q: |
350 | if (dev->i2c_bus[0].i2c_rc == 0) | ||
351 | hauppauge_eeprom(dev, eeprom+0x80); | ||
352 | break; | ||
350 | case CX23885_BOARD_HAUPPAUGE_HVR1800: | 353 | case CX23885_BOARD_HAUPPAUGE_HVR1800: |
351 | case CX23885_BOARD_HAUPPAUGE_HVR1800lp: | 354 | case CX23885_BOARD_HAUPPAUGE_HVR1800lp: |
352 | if (dev->i2c_bus[0].i2c_rc == 0) | 355 | if (dev->i2c_bus[0].i2c_rc == 0) |
353 | hauppauge_eeprom(dev, eeprom+0x80); | 356 | hauppauge_eeprom(dev, eeprom+0xc0); |
354 | break; | 357 | break; |
355 | } | 358 | } |
356 | 359 | ||