Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[~andy/linux] / drivers / media / pci / cx23885 / cx23885-core.c

diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 268654ac9a9f8b38661af386b6700ba3900d84b3..9f63d93239ec9d279f1de77952e6459ee40389fc 100644 (file)
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -1941,10 +1941,7 @@ static irqreturn_t cx23885_irq(int irq, void *dev_id)
 
        if ((pci_status & pci_mask) & PCI_MSK_AV_CORE) {
                cx23885_irq_disable(dev, PCI_MSK_AV_CORE);
-               if (!schedule_work(&dev->cx25840_work))
-                       printk(KERN_ERR "%s: failed to set up deferred work for"
-                              " AV Core/IR interrupt. Interrupt is disabled"
-                              " and won't be re-enabled\n", dev->name);
+               schedule_work(&dev->cx25840_work);
                handled++;
        }