diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 23:21:25 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-11-04 23:21:25 +0200 |
| commit | b777f329aa200fd184118da10cacc7800a3a522f (patch) | |
| tree | 8438f32fbb827b14d2a9dc7dc4d851572fa3f6d1 /linux/drivers/media | |
| parent | 81a04a87e3f14c489d50e505d148145397364b4a (diff) | |
| download | mediapointer-dvb-s2-b777f329aa200fd184118da10cacc7800a3a522f.tar.gz mediapointer-dvb-s2-b777f329aa200fd184118da10cacc7800a3a522f.tar.bz2 | |
Add few missing bits of code to saa7134_resume
From: Maxim Levitsky <maximlevitsky@gmail.com>
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>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 4de076e7e..c2921adf3 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1329,6 +1329,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); @@ -1340,6 +1341,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); |