diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-03-31 21:07:49 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-05-18 05:53:04 +0200 |
| commit | 92f4fc10d7ba01fd84abbfae963d379c73ba5a0f (patch) | |
| tree | 7f6023f8b86d284dd437948c02b28bb93476844b /drivers/media/video/cx88/cx88-video.c | |
| parent | V4L/DVB: ir-core: Add callbacks for input/evdev open/close on IR core (diff) | |
| download | linux-92f4fc10d7ba01fd84abbfae963d379c73ba5a0f.tar.xz linux-92f4fc10d7ba01fd84abbfae963d379c73ba5a0f.zip | |
V4L/DVB: cx88: Only start IR if the input device is opened
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
| -rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 48c450f4a85a..8e414f7aa76e 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c @@ -1977,7 +1977,7 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev) } if (core->ir) - cx88_ir_stop(core, core->ir); + cx88_ir_stop(core); cx88_shutdown(core); /* FIXME */ pci_disable_device(pci_dev); @@ -2015,7 +2015,7 @@ static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state) spin_unlock(&dev->slock); if (core->ir) - cx88_ir_stop(core, core->ir); + cx88_ir_stop(core); /* FIXME -- shutdown device */ cx88_shutdown(core); @@ -2056,7 +2056,7 @@ static int cx8800_resume(struct pci_dev *pci_dev) /* FIXME: re-initialize hardware */ cx88_reset(core); if (core->ir) - cx88_ir_start(core, core->ir); + cx88_ir_start(core); cx_set(MO_PCI_INTMSK, core->pci_irqmask); |