---

yaml --- r: 343791 b: refs/heads/master c: 2249b45 h: refs/heads/master i: 343789: 649431b 343787: 1961aba 343783: ab3b7ad 343775: 9ceb257 v: v3
git-mirror · Oct 27, 2012 · 0f5e0bc · 0f5e0bc
1 parent fb12481
commit 0f5e0bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);