aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap3isp/isp.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2014-03-09 19:57:53 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-25 10:32:08 -0400
commite8feb876d40f1428e40da33ee7dc2a7807cc145c (patch)
treee80555b7e6639ca5e989608ebad6e64a66baf769 /drivers/media/platform/omap3isp/isp.c
parent988d54c4b9463bd14bb05e4b8c9a47d04a14d272 (diff)
[media] omap3isp: Move queue irqlock to isp_video structure
This prepares for the move to videobuf2. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
-rw-r--r--drivers/media/platform/omap3isp/isp.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c
index 5a4801b76282..2c7aa6720569 100644
--- a/drivers/media/platform/omap3isp/isp.c
+++ b/drivers/media/platform/omap3isp/isp.c
@@ -1399,14 +1399,14 @@ int omap3isp_module_sync_idle(struct media_entity *me, wait_queue_head_t *wait,
1399 if (isp_pipeline_is_last(me)) { 1399 if (isp_pipeline_is_last(me)) {
1400 struct isp_video *video = pipe->output; 1400 struct isp_video *video = pipe->output;
1401 unsigned long flags; 1401 unsigned long flags;
1402 spin_lock_irqsave(&video->queue->irqlock, flags); 1402 spin_lock_irqsave(&video->irqlock, flags);
1403 if (video->dmaqueue_flags & ISP_VIDEO_DMAQUEUE_UNDERRUN) { 1403 if (video->dmaqueue_flags & ISP_VIDEO_DMAQUEUE_UNDERRUN) {
1404 spin_unlock_irqrestore(&video->queue->irqlock, flags); 1404 spin_unlock_irqrestore(&video->irqlock, flags);
1405 atomic_set(stopping, 0); 1405 atomic_set(stopping, 0);
1406 smp_mb(); 1406 smp_mb();
1407 return 0; 1407 return 0;
1408 } 1408 }
1409 spin_unlock_irqrestore(&video->queue->irqlock, flags); 1409 spin_unlock_irqrestore(&video->irqlock, flags);
1410 if (!wait_event_timeout(*wait, !atomic_read(stopping), 1410 if (!wait_event_timeout(*wait, !atomic_read(stopping),
1411 msecs_to_jiffies(1000))) { 1411 msecs_to_jiffies(1000))) {
1412 atomic_set(stopping, 0); 1412 atomic_set(stopping, 0);