From 0f5e0bcfa9accf07b59e83cd123cd2534780278c Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Tue, 9 Oct 2012 23:33:29 -0300
Subject: [PATCH] --- yaml --- r: 343791 b: refs/heads/master c:
 2249b45701f9817f91d9a334fa30147e133badc4 h: refs/heads/master i:   343789:
 649431b10e6f82bc3fa4385f991400a5213c766e   343787:
 1961aba3229fc90daa24d1bd8cd7db13c273e0e1   343783:
 ab3b7ad0e1a41e508979130face74a9a884e37ee   343775:
 9ceb257b76bc1b8be21f864108c2c2774cb785a5 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/media/platform/coda.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9fe344dfff67..e99e2c59b878 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 01aea0bfd8dfa8bc868df33904461984bb10a87a
+refs/heads/master: 2249b45701f9817f91d9a334fa30147e133badc4
diff --git a/trunk/drivers/media/platform/coda.c b/trunk/drivers/media/platform/coda.c
index cd04ae252c30..764050556b6d 100644
--- a/trunk/drivers/media/platform/coda.c
+++ b/trunk/drivers/media/platform/coda.c
@@ -1540,7 +1540,7 @@ static irqreturn_t coda_irq_handler(int irq, void *data)
 	u32 wr_ptr, start_ptr;
 	struct coda_ctx *ctx;
 
-	__cancel_delayed_work(&dev->timeout);
+	cancel_delayed_work(&dev->timeout);
 
 	/* read status register to attend the IRQ */
 	coda_read(dev, CODA_REG_BIT_INT_STATUS);