aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-03-31 15:07:49 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-17 23:53:04 -0400
commit92f4fc10d7ba01fd84abbfae963d379c73ba5a0f (patch)
tree7f6023f8b86d284dd437948c02b28bb93476844b /drivers/media/video/cx88/cx88-video.c
parent716aab44df8bb9bdf16abea9013890274329b61f (diff)
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.c6
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)
1977 } 1977 }
1978 1978
1979 if (core->ir) 1979 if (core->ir)
1980 cx88_ir_stop(core, core->ir); 1980 cx88_ir_stop(core);
1981 1981
1982 cx88_shutdown(core); /* FIXME */ 1982 cx88_shutdown(core); /* FIXME */
1983 pci_disable_device(pci_dev); 1983 pci_disable_device(pci_dev);
@@ -2015,7 +2015,7 @@ static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
2015 spin_unlock(&dev->slock); 2015 spin_unlock(&dev->slock);
2016 2016
2017 if (core->ir) 2017 if (core->ir)
2018 cx88_ir_stop(core, core->ir); 2018 cx88_ir_stop(core);
2019 /* FIXME -- shutdown device */ 2019 /* FIXME -- shutdown device */
2020 cx88_shutdown(core); 2020 cx88_shutdown(core);
2021 2021
@@ -2056,7 +2056,7 @@ static int cx8800_resume(struct pci_dev *pci_dev)
2056 /* FIXME: re-initialize hardware */ 2056 /* FIXME: re-initialize hardware */
2057 cx88_reset(core); 2057 cx88_reset(core);
2058 if (core->ir) 2058 if (core->ir)
2059 cx88_ir_start(core, core->ir); 2059 cx88_ir_start(core);
2060 2060
2061 cx_set(MO_PCI_INTMSK, core->pci_irqmask); 2061 cx_set(MO_PCI_INTMSK, core->pci_irqmask);
2062 2062