Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 76478
b: refs/heads/master
c: 5c01203
h: refs/heads/master
v: v3
  • Loading branch information
Maxim Levitsky authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 5fc868a commit 8c09b62
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3203cb86d22c63504f8368151029bf9dad014ddb
refs/heads/master: 5c01203fd289214ae3062dab4039fcbab4b2b84f
3 changes: 3 additions & 0 deletions trunk/drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);
Expand Down

0 comments on commit 8c09b62

Please sign in to comment.