Browse Source

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>
Matthias Schwarzott 18 years ago
parent
commit
f40aa808ba
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/media/video/saa7134/saa7134-core.c

+ 3 - 1
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);