diff options
author | Luis Alves <ljalvs@gmail.com> | 2013-07-11 11:02:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <m.chehab@samsung.com> | 2013-08-24 04:05:26 -0400 |
commit | c21412f5d3717abcc0b1e7ad31f3740415114144 (patch) | |
tree | 2989b6a178ff0d42fc914a7f2068a2922017db74 /drivers/media/pci | |
parent | a3fbba0e39de102bcc65bcc66abeb73d3cf7f633 (diff) |
[media] Fixed misleading error when handling IR interrupts
Hi,
Handling the AV Core/IR interrupts schedules its workqueue but
the schedule_work function returns false if @work was already on the
kernel-global workqueue and true otherwise.
Printing an error message if @work wasn't in the queue is wrong.
Regards,
Luis
Signed-off-by: Luis Alves <ljalvs@gmail.com>
Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r-- | drivers/media/pci/cx23885/cx23885-core.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c index 268654ac9a9f..9f63d93239ec 100644 --- 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) | |||
1941 | 1941 | ||
1942 | if ((pci_status & pci_mask) & PCI_MSK_AV_CORE) { | 1942 | if ((pci_status & pci_mask) & PCI_MSK_AV_CORE) { |
1943 | cx23885_irq_disable(dev, PCI_MSK_AV_CORE); | 1943 | cx23885_irq_disable(dev, PCI_MSK_AV_CORE); |
1944 | if (!schedule_work(&dev->cx25840_work)) | 1944 | schedule_work(&dev->cx25840_work); |
1945 | printk(KERN_ERR "%s: failed to set up deferred work for" | ||
1946 | " AV Core/IR interrupt. Interrupt is disabled" | ||
1947 | " and won't be re-enabled\n", dev->name); | ||
1948 | handled++; | 1945 | handled++; |
1949 | } | 1946 | } |
1950 | 1947 | ||