diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-18 15:58:11 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-18 15:58:11 -0200 |
| commit | a62117aed50a2e1370520066d61db0dc3e040c49 (patch) | |
| tree | 401f4efc4d53cdacd6afb5999b18f3d50a4ed6e6 /linux/drivers/media/video | |
| parent | c8242ef2c46a80532ac98868b878d2dc05ffc13d (diff) | |
| download | mediapointer-dvb-s2-a62117aed50a2e1370520066d61db0dc3e040c49.tar.gz mediapointer-dvb-s2-a62117aed50a2e1370520066d61db0dc3e040c49.tar.bz2 | |
saa7134: fix NULL dereference at suspend time for cards without IR receiver
Calling saa7134_ir_stop at suspend is no good idea
for saa7134 cards without remote control.
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-core.c b/linux/drivers/media/video/saa7134/saa7134-core.c index 5471bc017..6559c80cc 100644 --- a/linux/drivers/media/video/saa7134/saa7134-core.c +++ b/linux/drivers/media/video/saa7134/saa7134-core.c @@ -1284,7 +1284,9 @@ static int saa7134_suspend(struct pci_dev *pci_dev , pm_message_t state) del_timer(&dev->video_q.timeout); del_timer(&dev->vbi_q.timeout); del_timer(&dev->ts_q.timeout); - saa7134_ir_stop(dev); + + if (dev->remote) + saa7134_ir_stop(dev); pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state)); pci_save_state(pci_dev); |