Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f40aa808 authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

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: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6b1ec9da

drivers/media/video/saa7134/saa7134-core.c

+3 −1
Original line number Diff line number Diff line
@@ -1189,6 +1189,8 @@ 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);



	if (dev->remote)

		saa7134_ir_stop(dev);



	pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state));