diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
| commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
| tree | 495baa14e638817941496c36e1443aed7dae0ea0 /drivers/media/pci/cx88/cx88-video.c | |
| parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
| parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) | |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'drivers/media/pci/cx88/cx88-video.c')
| -rw-r--r-- | drivers/media/pci/cx88/cx88-video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index a146d50d7795..05171457bf28 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c | |||
| @@ -1535,7 +1535,7 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id) | |||
| 1535 | cx88_core_irq(core,status); | 1535 | cx88_core_irq(core,status); |
| 1536 | if (status & PCI_INT_VIDINT) | 1536 | if (status & PCI_INT_VIDINT) |
| 1537 | cx8800_vid_irq(dev); | 1537 | cx8800_vid_irq(dev); |
| 1538 | }; | 1538 | } |
| 1539 | if (10 == loop) { | 1539 | if (10 == loop) { |
| 1540 | printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", | 1540 | printk(KERN_WARNING "%s/0: irq loop -- clearing mask\n", |
| 1541 | core->name); | 1541 | core->name); |