[media] v4l: vsp1: Fix spinlock in mixed IRQ context function
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tue, 13 Sep 2016 23:19:29 +0000 (20:19 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 19 Sep 2016 18:01:49 +0000 (15:01 -0300)
The wpf_configure() function can be called both from IRQ and non-IRQ
contexts, use spin_lock_irqsave().

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/vsp1/vsp1_wpf.c

index fdee5a891e4074681871b38aee21c85bbcd85923..deb53b5df1cff418a40122261a7602fb85250ae5 100644 (file)
@@ -189,11 +189,12 @@ static void wpf_configure(struct vsp1_entity *entity,
        if (params == VSP1_ENTITY_PARAMS_RUNTIME) {
                const unsigned int mask = BIT(WPF_CTRL_VFLIP)
                                        | BIT(WPF_CTRL_HFLIP);
+               unsigned long flags;
 
-               spin_lock(&wpf->flip.lock);
+               spin_lock_irqsave(&wpf->flip.lock, flags);
                wpf->flip.active = (wpf->flip.active & ~mask)
                                 | (wpf->flip.pending & mask);
-               spin_unlock(&wpf->flip.lock);
+               spin_unlock_irqrestore(&wpf->flip.lock, flags);
 
                outfmt = (wpf->alpha << VI6_WPF_OUTFMT_PDV_SHIFT) | wpf->outfmt;