]> err.no Git - linux-2.6/commitdiff
[PATCH] don't freeze firewire on suspend.
authorDave Jones <davej@redhat.com>
Fri, 6 Jan 2006 08:18:38 +0000 (00:18 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 16:33:43 +0000 (08:33 -0800)
We had a report from one loony user who tried out suspend to disk using a
swap partition on a firewire drive.  As the firewire thread was put to
sleep it didn't work out too well.

Signed-off-by: Dave Jones <davej@redhat.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Ben Collins <bcollins@debian.org>
Cc: Jody McIntyre <scjody@modernduck.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/ieee1394/ieee1394_core.c

index 64fbbb01d52ae2c469ea5febc40128291ac7758f..25ef5a86f5f0dc62f27b0b34b088949c2b325b94 100644 (file)
@@ -1027,10 +1027,10 @@ static int hpsbpkt_thread(void *__hi)
 
        daemonize("khpsbpkt");
 
+       current->flags |= PF_NOFREEZE;
+
        while (1) {
                if (down_interruptible(&khpsbpkt_sig)) {
-                       if (try_to_freeze())
-                               continue;
                        printk("khpsbpkt: received unexpected signal?!\n" );
                        break;
                }