Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.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 347c334..1b79475 100644 (file)
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -193,6 +193,7 @@ MODULE_PARM_DESC(cardtype,
                 "\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\t28 = Sony VAIO Giga Pocket (ENX Kikyou)\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");
@@ -1292,7 +1293,6 @@ int ivtv_init_on_first_open(struct ivtv *itv)
                ivtv_call_hw(itv, IVTV_HW_SAA7127, video, s_stream, 1);
                ivtv_init_mpeg_decoder(itv);
        }
-       ivtv_s_std(NULL, &fh, &itv->tuner_std);
 
        /* On a cx23416 this seems to be able to enable DMA to the chip? */
        if (!itv->has_cx23415)
@@ -1309,6 +1309,10 @@ int ivtv_init_on_first_open(struct ivtv *itv)
        }
        else
                ivtv_clear_irq_mask(itv, IVTV_IRQ_MASK_INIT);
+
+       /* For cards with video out, this call needs interrupts enabled */
+       ivtv_s_std(NULL, &fh, &itv->tuner_std);
+
        return 0;
 }