[media] media: davinci: vpif_capture: fix the check on suspend/resume callbacks
authorPrabhakar Lad <prabhakar.csengg@gmail.com>
Sat, 6 Sep 2014 15:26:51 +0000 (12:26 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Sun, 21 Sep 2014 23:16:39 +0000 (20:16 -0300)
It is possible to call STREAMON without having any buffers queued.
So vb2_is_streaming() can return true without start_streaming()
having been called. Only after at least one buffer has been
queued will start_streaming be called.

The check vb2_is_streaming() is incorrect as this would start
the DMA without having proper DMA pointers set up. this patch
uses vb2_start_streaming_called() instead to check is streaming
was called.

Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/platform/davinci/vpif_capture.c

index 881efcdbee878383303fd50af47b409ce8327cf6..3ccb26ff43c8dfa31935c3f8f1eed6dee126c3c5 100644 (file)
@@ -1596,7 +1596,7 @@ static int vpif_suspend(struct device *dev)
                ch = vpif_obj.dev[i];
                common = &ch->common[VPIF_VIDEO_INDEX];
 
-               if (!vb2_is_streaming(&common->buffer_queue))
+               if (!vb2_start_streaming_called(&common->buffer_queue))
                        continue;
 
                mutex_lock(&common->lock);
@@ -1630,7 +1630,7 @@ static int vpif_resume(struct device *dev)
                ch = vpif_obj.dev[i];
                common = &ch->common[VPIF_VIDEO_INDEX];
 
-               if (!vb2_is_streaming(&common->buffer_queue))
+               if (!vb2_start_streaming_called(&common->buffer_queue))
                        continue;
 
                mutex_lock(&common->lock);