diff options
author | Maxim Levitsky <maximlevitsky@gmail.com> | 2007-11-04 16:21:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-25 16:02:45 -0500 |
commit | 5c01203fd289214ae3062dab4039fcbab4b2b84f (patch) | |
tree | 1e4ae02fee9ca9bd4821770db27a30e9f1163210 | |
parent | 3203cb86d22c63504f8368151029bf9dad014ddb (diff) |
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.c | 3 |
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) | |||
1227 | saa7134_ir_start(dev, dev->remote); | 1227 | saa7134_ir_start(dev, dev->remote); |
1228 | saa7134_hw_enable1(dev); | 1228 | saa7134_hw_enable1(dev); |
1229 | 1229 | ||
1230 | msleep(100); | ||
1230 | 1231 | ||
1231 | saa7134_board_init2(dev); | 1232 | saa7134_board_init2(dev); |
1232 | 1233 | ||
@@ -1238,6 +1239,8 @@ static int saa7134_resume(struct pci_dev *pci_dev) | |||
1238 | saa7134_enable_i2s(dev); | 1239 | saa7134_enable_i2s(dev); |
1239 | saa7134_hw_enable2(dev); | 1240 | saa7134_hw_enable2(dev); |
1240 | 1241 | ||
1242 | saa7134_irq_video_signalchange(dev); | ||
1243 | |||
1241 | /*resume unfinished buffer(s)*/ | 1244 | /*resume unfinished buffer(s)*/ |
1242 | spin_lock_irqsave(&dev->slock, flags); | 1245 | spin_lock_irqsave(&dev->slock, flags); |
1243 | saa7134_buffer_requeue(dev, &dev->video_q); | 1246 | saa7134_buffer_requeue(dev, &dev->video_q); |