From 8c09b6289f1d633dbf4644279dbcaeabd22743e3 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Sun, 4 Nov 2007 18:21:25 -0300 Subject: [PATCH] --- yaml --- r: 76478 b: refs/heads/master c: 5c01203fd289214ae3062dab4039fcbab4b2b84f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-core.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 81cd37ae3082..264d20332760 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3203cb86d22c63504f8368151029bf9dad014ddb +refs/heads/master: 5c01203fd289214ae3062dab4039fcbab4b2b84f diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c index 85c165d17301..f5e43d375d2a 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-core.c +++ b/trunk/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);