diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:05:47 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-13 00:05:47 -0300 |
| commit | e671695e92889f4471901f0fd96b4495d60a6022 (patch) | |
| tree | b3c48e34b61237be7bf0869b8ff66bdc4dad2fb0 /linux/drivers/media/video/cx18/cx18-driver.c | |
| parent | 4969b6d8d0847eb8f756b4424f6eef2f2fe85677 (diff) | |
| parent | 592120ae5b01a9f0001734872622bebda6855195 (diff) | |
| download | mediapointer-dvb-s2-e671695e92889f4471901f0fd96b4495d60a6022.tar.gz mediapointer-dvb-s2-e671695e92889f4471901f0fd96b4495d60a6022.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/xc5000
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-driver.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-driver.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-driver.c b/linux/drivers/media/video/cx18/cx18-driver.c index f66aa43ee..008745af2 100644 --- a/linux/drivers/media/video/cx18/cx18-driver.c +++ b/linux/drivers/media/video/cx18/cx18-driver.c @@ -210,13 +210,13 @@ static void cx18_process_eeprom(struct cx18 *cx) /* Many thanks to Steven Toth from Hauppauge for providing the model numbers */ + /* Note: the Samsung memory models cannot be reliably determined + from the model number. Use the cardtype module option if you + have one of these preproduction models. */ switch (tv.model) { - case 74000 ... 74099: + case 74000 ... 74999: cx->card = cx18_get_card(CX18_CARD_HVR_1600_ESMT); break; - case 74700 ... 74799: - cx->card = cx18_get_card(CX18_CARD_HVR_1600_SAMSUNG); - break; case 0: CX18_ERR("Invalid EEPROM\n"); return; @@ -904,8 +904,7 @@ static void cx18_remove(struct pci_dev *pci_dev) free_irq(cx->dev->irq, (void *)cx); - if (cx->dev) - cx18_iounmap(cx); + cx18_iounmap(cx); release_mem_region(cx->base_addr, CX18_MEM_SIZE); |