Skip to content

Commit

Permalink
V4L/DVB (6668): Fix theoretical races between IRQ handler and .suspen…
Browse files Browse the repository at this point in the history
…d/resume

*dev->insuspend = 1 should be set before synchronize_irq
 *ACK interrupts after synchronize_irq, to make sure there aren't
 pending interrupts.
 *Add barrier before we restart interrupts so the handler will 100%
 see the dev->insuspend

Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
  • Loading branch information
Maxim Levitsky authored and Mauro Carvalho Chehab committed Jan 25, 2008
1 parent 0d65cd4 commit 3203cb8
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1181,8 +1181,13 @@ static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state)
saa_writel(SAA7134_IRQ2, 0);
saa_writel(SAA7134_MAIN_CTRL, 0);

synchronize_irq(pci_dev->irq);
dev->insuspend = 1;
synchronize_irq(pci_dev->irq);

/* ACK interrupts once more, just in case,
since the IRQ handler won't ack them anymore*/

saa_writel(SAA7134_IRQ_REPORT, saa_readl(SAA7134_IRQ_REPORT));

/* Disable timeout timers - if we have active buffers, we will
fill them on resume*/
Expand Down Expand Up @@ -1246,6 +1251,7 @@ static int saa7134_resume(struct pci_dev *pci_dev)

/* start DMA now*/
dev->insuspend = 0;
smp_wmb();
saa7134_set_dmabits(dev);
spin_unlock_irqrestore(&dev->slock, flags);

Expand Down

0 comments on commit 3203cb8

Please sign in to comment.