From e5872251cdf59ad284eb7ebb5960208d1753d9d8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Mon, 5 Sep 2016 10:09:17 -0300 Subject: [PATCH] [media] Revert "[media] tw5864: remove double irq lock code" This reverts commit 617e901a12ad ("[media] tw5864: remove double irq lock code"). That commit was rejected by Andrey Utkin , but it had already been merged. Revert and apply Andrey's corrected patch next. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/pci/tw5864/tw5864-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/pci/tw5864/tw5864-core.c b/drivers/media/pci/tw5864/tw5864-core.c index e3d884e963c0..440cd7bb8d04 100644 --- a/drivers/media/pci/tw5864/tw5864-core.c +++ b/drivers/media/pci/tw5864/tw5864-core.c @@ -157,10 +157,12 @@ static void tw5864_h264_isr(struct tw5864_dev *dev) cur_frame = next_frame; + spin_lock_irqsave(&input->slock, flags); input->frame_seqno++; input->frame_gop_seqno++; if (input->frame_gop_seqno >= input->gop) input->frame_gop_seqno = 0; + spin_unlock_irqrestore(&input->slock, flags); } else { dev_err(&dev->pci->dev, "Skipped frame on input %d because all buffers busy\n", -- 2.30.2