From 32271b3adad620e1e2a3f3bbd09bd9044f365246 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 5 Jul 2011 07:19:23 -0300 Subject: [PATCH] --- yaml --- r: 261460 b: refs/heads/master c: 1de5be5e91ee10d8f42be2aebc1cede718b48d50 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/vivi.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f5cb966835c4..156db7a8e12c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee490b466162925193c847b02aabd6048ff8cbe9 +refs/heads/master: 1de5be5e91ee10d8f42be2aebc1cede718b48d50 diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index cc1cf6b17183..6e7bf5719b34 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -529,11 +529,13 @@ static void vivi_thread_tick(struct vivi_dev *dev) spin_lock_irqsave(&dev->slock, flags); if (list_empty(&dma_q->active)) { dprintk(dev, 1, "No active queue to serve\n"); - goto unlock; + spin_unlock_irqrestore(&dev->slock, flags); + return; } buf = list_entry(dma_q->active.next, struct vivi_buffer, list); list_del(&buf->list); + spin_unlock_irqrestore(&dev->slock, flags); do_gettimeofday(&buf->vb.v4l2_buf.timestamp); @@ -543,8 +545,6 @@ static void vivi_thread_tick(struct vivi_dev *dev) vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE); dprintk(dev, 2, "[%p/%d] done\n", buf, buf->vb.v4l2_buf.index); -unlock: - spin_unlock_irqrestore(&dev->slock, flags); } #define frames_to_ms(frames) \