]> err.no Git - linux-2.6/commitdiff
V4L/DVB (6669): Add few missing bits of code to saa7134_resume
authorMaxim Levitsky <maximlevitsky@gmail.com>
Sun, 4 Nov 2007 21:21:25 +0000 (18:21 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 25 Jan 2008 21:02:45 +0000 (19:02 -0200)
First the saa7134_initdev waits between saa7134_hwinit1
and saa7134_hwinit2 , thus it is probably wise to do the same in saa7134_resume
some hardware probably needs this.

Call saa7134_irq_video_signalchange in .resume like in saa7134_resume to make
saa7134_resume mirror perfectly the saa7134_initdev although
this call isn't strictly necessary in the saa7134_initdev,
but it won't harm anyway.

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/saa7134/saa7134-core.c

index 85c165d173016eab4bfa58c397ae064263e5d252..f5e43d375d2add40aa032a677d2c6c0d39879784 100644 (file)
@@ -1227,6 +1227,7 @@ static int saa7134_resume(struct pci_dev *pci_dev)
                saa7134_ir_start(dev, dev->remote);
        saa7134_hw_enable1(dev);
 
+       msleep(100);
 
        saa7134_board_init2(dev);
 
@@ -1238,6 +1239,8 @@ static int saa7134_resume(struct pci_dev *pci_dev)
        saa7134_enable_i2s(dev);
        saa7134_hw_enable2(dev);
 
+       saa7134_irq_video_signalchange(dev);
+
        /*resume unfinished buffer(s)*/
        spin_lock_irqsave(&dev->slock, flags);
        saa7134_buffer_requeue(dev, &dev->video_q);