From: Matthias Schwarzott Date: Thu, 18 Oct 2007 17:58:11 +0000 (-0300) Subject: V4L/DVB (6382): saa7134: fix NULL dereference at suspend time for cards without IR... X-Git-Tag: v2.6.24-rc1~66^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f40aa808bad19a079a0e122e326d6970df141afb;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 410242a91f4..a499eea379e 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);