diff options
| author | Matthias Schwarzott <zzam@gentoo.org> | 2007-10-18 14:58:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-22 12:01:53 -0200 |
| commit | f40aa808bad19a079a0e122e326d6970df141afb (patch) | |
| tree | afd968ea721ea590b60c559d6ba971aa3d2d3da3 /drivers/media | |
| parent | 6b1ec9da152c03106aa92fa045f5cf9b7912597c (diff) | |
| download | blackbird-op-linux-f40aa808bad19a079a0e122e326d6970df141afb.tar.gz blackbird-op-linux-f40aa808bad19a079a0e122e326d6970df141afb.zip | |
V4L/DVB (6382): 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 'drivers/media')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 410242a91f43..a499eea379e6 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c @@ -1189,7 +1189,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); |
