Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f40aa808bad19a079a0e122e326d6970df141afb
Commit:     f40aa808bad19a079a0e122e326d6970df141afb
Parent:     6b1ec9da152c03106aa92fa045f5cf9b7912597c
Author:     Matthias Schwarzott <[EMAIL PROTECTED]>
AuthorDate: Thu Oct 18 14:58:11 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Mon Oct 22 12:01:53 2007 -0200

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 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 410242a..a499eea 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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to