summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2007-11-04 18:21:25 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:02:45 -0200
commit5c01203fd289214ae3062dab4039fcbab4b2b84f (patch)
tree1e4ae02fee9ca9bd4821770db27a30e9f1163210
parent3203cb86d22c63504f8368151029bf9dad014ddb (diff)
downloadblackbird-op-linux-5c01203fd289214ae3062dab4039fcbab4b2b84f.tar.gz
blackbird-op-linux-5c01203fd289214ae3062dab4039fcbab4b2b84f.zip
V4L/DVB (6669): Add few missing bits of code to saa7134_resume
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>
-rw-r--r--drivers/media/video/saa7134/saa7134-core.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index 85c165d17301..f5e43d375d2a 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -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);
OpenPOWER on IntegriCloud