From 30fc8c6967bde964665105dc7005bc60a4527689 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Thu, 10 May 2012 03:35:47 -0300 Subject: [PATCH] --- yaml --- r: 306488 b: refs/heads/master c: 2356877cb12969cac1572f195d541a2b49d7d78e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/s5p-g2d/g2d.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index aa522d082729..8e26b41c4713 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a13bba4f35eee67552b0fcfb0790d9a0f5f5fd07 +refs/heads/master: 2356877cb12969cac1572f195d541a2b49d7d78e diff --git a/trunk/drivers/media/video/s5p-g2d/g2d.c b/trunk/drivers/media/video/s5p-g2d/g2d.c index 02605cecfd65..059d93210670 100644 --- a/trunk/drivers/media/video/s5p-g2d/g2d.c +++ b/trunk/drivers/media/video/s5p-g2d/g2d.c @@ -546,11 +546,11 @@ static void job_abort(void *prv) struct g2d_dev *dev = ctx->dev; int ret; - if (dev->curr == 0) /* No job currently running */ + if (dev->curr == NULL) /* No job currently running */ return; ret = wait_event_timeout(dev->irq_queue, - dev->curr == 0, + dev->curr == NULL, msecs_to_jiffies(G2D_TIMEOUT)); } @@ -599,19 +599,19 @@ static irqreturn_t g2d_isr(int irq, void *prv) g2d_clear_int(dev); clk_disable(dev->gate); - BUG_ON(ctx == 0); + BUG_ON(ctx == NULL); src = v4l2_m2m_src_buf_remove(ctx->m2m_ctx); dst = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx); - BUG_ON(src == 0); - BUG_ON(dst == 0); + BUG_ON(src == NULL); + BUG_ON(dst == NULL); v4l2_m2m_buf_done(src, VB2_BUF_STATE_DONE); v4l2_m2m_buf_done(dst, VB2_BUF_STATE_DONE); v4l2_m2m_job_finish(dev->m2m_dev, ctx->m2m_ctx); - dev->curr = 0; + dev->curr = NULL; wake_up(&dev->irq_queue); return IRQ_HANDLED; }