Skip to content

Commit

Permalink
V4L/DVB (6382): saa7134: fix NULL dereference at suspend time for car…
Browse files Browse the repository at this point in the history
…ds 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>
  • Loading branch information
Matthias Schwarzott authored and Mauro Carvalho Chehab committed Oct 22, 2007
1 parent 6b1ec9d commit f40aa80
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/media/video/saa7134/saa7134-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit f40aa80

Please sign in to comment.