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);