V4L/DVB (7889): cx18: improve HVR-1600 detection.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index 18489cce18d8..553adbf2cd44 100644
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/drivers/media/video/cx18/cx18-cards.c
@@ -87,11 +87,12 @@ static const struct cx18_card cx18_card_hvr1600_esmt = {
 static const struct cx18_card cx18_card_hvr1600_samsung = {
         .type = CX18_CARD_HVR_1600_SAMSUNG,
         .name = "Hauppauge HVR-1600 (Preproduction)",
-        .comment = "DVB & VBI are not yet supported\n",
+        .comment = "VBI is not yet supported\n",
         .v4l2_capabilities = CX18_CAP_ENCODER,
         .hw_audio_ctrl = CX18_HW_CX23418,
         .hw_muxer = CX18_HW_CS5345,
-        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER | CX18_HW_CS5345,
+        .hw_all = CX18_HW_TVEEPROM | CX18_HW_TUNER |
+                  CX18_HW_CS5345 | CX18_HW_DVB,
         .video_inputs = {
                 { CX18_CARD_INPUT_VID_TUNER,  0, CX23418_COMPOSITE7 },
                 { CX18_CARD_INPUT_SVIDEO1,    1, CX23418_SVIDEO1    },
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 3e9979eff3e0..98e1bddc290b 100644
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/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;