[media] v4l: vsp1: Ensure pipeline locking in resume path
authorKieran Bingham <kieran+renesas@bingham.xyz>
Fri, 2 Sep 2016 10:48:27 +0000 (07:48 -0300)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 19 Sep 2016 17:46:48 +0000 (14:46 -0300)
The vsp1_pipeline_ready() and vsp1_pipeline_run() functions must be
called with the pipeline lock held, fix the resume code path.

Signed-off-by: Kieran Bingham <kieran+renesas@bingham.xyz>
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_pipe.c

index 3e75fb3fcace3a75ee68816b9c6f27a06b2bd3cb..474de82165d85e0baefbc2df793f5109e9cc7250 100644 (file)
@@ -365,6 +365,7 @@ void vsp1_pipelines_suspend(struct vsp1_device *vsp1)
 
 void vsp1_pipelines_resume(struct vsp1_device *vsp1)
 {
+       unsigned long flags;
        unsigned int i;
 
        /* Resume all running pipelines. */
@@ -379,7 +380,9 @@ void vsp1_pipelines_resume(struct vsp1_device *vsp1)
                if (pipe == NULL)
                        continue;
 
+               spin_lock_irqsave(&pipe->irqlock, flags);
                if (vsp1_pipeline_ready(pipe))
                        vsp1_pipeline_run(pipe);
+               spin_unlock_irqrestore(&pipe->irqlock, flags);
        }
 }