V4L/DVB (12209): ivtv: Add card entry for AVerMedia UltraTV 1500 MCE (M113 variant)

[deliverable/linux.git] / drivers / media / video / ivtv / ivtv-driver.c

diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index db2ac9a99acd68b96f5af3e439acd4206ed3e01a..63ea0fb660630d8a3d4693e75a0b552eba2277b0 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -186,6 +186,7 @@ MODULE_PARM_DESC(cardtype,
                 "\t\t\t24 = AverMedia EZMaker PCI Deluxe\n"
                 "\t\t\t25 = AverMedia M104 (not yet working)\n"
                 "\t\t\t26 = Buffalo PC-MV5L/PCI\n"
+                "\t\t\t27 = AVerMedia UltraTV 1500 MCE\n"
                 "\t\t\t 0 = Autodetect (default)\n"
                 "\t\t\t-1 = Ignore this card\n\t\t");
 MODULE_PARM_DESC(pal, "Set PAL standard: BGH, DK, I, M, N, Nc, 60");
@@ -218,7 +219,7 @@ MODULE_PARM_DESC(ivtv_yuv_mode,
                 "\t\t\tDefault: 0 (interlaced)");
 MODULE_PARM_DESC(ivtv_yuv_threshold,
                 "If ivtv_yuv_mode is 2 (auto) then playback content as\n\t\tprogressive if src height <= ivtv_yuvthreshold\n"
-                "\t\t\tDefault: 480");;
+                "\t\t\tDefault: 480");
 MODULE_PARM_DESC(enc_mpg_buffers,
                 "Encoder MPG Buffers (in MB)\n"
                 "\t\t\tDefault: " __stringify(IVTV_DEFAULT_ENC_MPG_BUFFERS));
@@ -455,7 +456,7 @@ static void ivtv_process_eeprom(struct ivtv *itv)
                        break;
        }
        if (tv.tuner_type == TUNER_ABSENT)
-               IVTV_ERR("tveeprom cannot autodetect tuner!");
+               IVTV_ERR("tveeprom cannot autodetect tuner!\n");
 
        if (itv->options.tuner == -1)
                itv->options.tuner = tv.tuner_type;
@@ -946,17 +947,14 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
        if (itv == NULL)
                return -ENOMEM;
        itv->pdev = pdev;
-       itv->instance = atomic_inc_return(&ivtv_instance) - 1;
+       itv->instance = v4l2_device_set_name(&itv->v4l2_dev, "ivtv",
+                                               &ivtv_instance);
 
        retval = v4l2_device_register(&pdev->dev, &itv->v4l2_dev);
        if (retval) {
                kfree(itv);
                return retval;
        }
-       /* "ivtv + PCI ID" is a bit of a mouthful, so use
-          "ivtv + instance" instead. */
-       snprintf(itv->v4l2_dev.name, sizeof(itv->v4l2_dev.name),
-                       "ivtv%d", itv->instance);
        IVTV_INFO("Initializing card %d\n", itv->instance);
 
        ivtv_process_options(itv);