diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-video.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-video.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c index 94c92bacc342..fbc79e9842aa 100644 --- a/drivers/media/video/cx88/cx88-video.c +++ b/drivers/media/video/cx88/cx88-video.c | |||
@@ -497,6 +497,7 @@ static int start_video_dma(struct cx8800_dev *dev, | |||
497 | return 0; | 497 | return 0; |
498 | } | 498 | } |
499 | 499 | ||
500 | #ifdef CONFIG_PM | ||
500 | static int stop_video_dma(struct cx8800_dev *dev) | 501 | static int stop_video_dma(struct cx8800_dev *dev) |
501 | { | 502 | { |
502 | struct cx88_core *core = dev->core; | 503 | struct cx88_core *core = dev->core; |
@@ -512,6 +513,7 @@ static int stop_video_dma(struct cx8800_dev *dev) | |||
512 | cx_clear(MO_VID_INTMSK, 0x0f0011); | 513 | cx_clear(MO_VID_INTMSK, 0x0f0011); |
513 | return 0; | 514 | return 0; |
514 | } | 515 | } |
516 | #endif | ||
515 | 517 | ||
516 | static int restart_video_queue(struct cx8800_dev *dev, | 518 | static int restart_video_queue(struct cx8800_dev *dev, |
517 | struct cx88_dmaqueue *q) | 519 | struct cx88_dmaqueue *q) |
@@ -2017,6 +2019,7 @@ static void __devexit cx8800_finidev(struct pci_dev *pci_dev) | |||
2017 | kfree(dev); | 2019 | kfree(dev); |
2018 | } | 2020 | } |
2019 | 2021 | ||
2022 | #ifdef CONFIG_PM | ||
2020 | static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state) | 2023 | static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state) |
2021 | { | 2024 | { |
2022 | struct cx8800_dev *dev = pci_get_drvdata(pci_dev); | 2025 | struct cx8800_dev *dev = pci_get_drvdata(pci_dev); |
@@ -2092,6 +2095,7 @@ static int cx8800_resume(struct pci_dev *pci_dev) | |||
2092 | 2095 | ||
2093 | return 0; | 2096 | return 0; |
2094 | } | 2097 | } |
2098 | #endif | ||
2095 | 2099 | ||
2096 | /* ----------------------------------------------------------- */ | 2100 | /* ----------------------------------------------------------- */ |
2097 | 2101 | ||
@@ -2112,9 +2116,10 @@ static struct pci_driver cx8800_pci_driver = { | |||
2112 | .id_table = cx8800_pci_tbl, | 2116 | .id_table = cx8800_pci_tbl, |
2113 | .probe = cx8800_initdev, | 2117 | .probe = cx8800_initdev, |
2114 | .remove = __devexit_p(cx8800_finidev), | 2118 | .remove = __devexit_p(cx8800_finidev), |
2115 | 2119 | #ifdef CONFIG_PM | |
2116 | .suspend = cx8800_suspend, | 2120 | .suspend = cx8800_suspend, |
2117 | .resume = cx8800_resume, | 2121 | .resume = cx8800_resume, |
2122 | #endif | ||
2118 | }; | 2123 | }; |
2119 | 2124 | ||
2120 | static int cx8800_init(void) | 2125 | static int cx8800_init(void) |