Merge commit '67dd8f35c2d8ed80f26c9654b474cffc11c6674d' into patchwork

[karo-tx-linux.git] / drivers / media / platform / davinci / vpif_display.c

diff --git a/drivers/media/platform/davinci/vpif_display.c b/drivers/media/platform/davinci/vpif_display.c
index 6c6bd6b47994e6e4e19ca61980985f26b7e99060..a03ec7381cfef734da18537f822e34ed959af55f 100644 (file)
--- a/drivers/media/platform/davinci/vpif_display.c
+++ b/drivers/media/platform/davinci/vpif_display.c
@@ -233,6 +233,7 @@ err:
                list_del(&buf->list);
                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
        }
+       spin_unlock_irqrestore(&common->irqlock, flags);
 
        return ret;
 }