[patch] [resend] Fix swsusp with PNP BIOS

[Ondrej Zary <linux@rainbow-software.org>]

Hello,
swsusp is unable to suspend my machine (DTK FortisPro TOP-5A notebook) with 
kernel 2.6.17.5 because it's unable to suspend PNP device 00:16 (mouse).

The problem is in PNP BIOS. pnp_bus_suspend() calls pnp_stop_dev() for the 
device if the device can be disabled according to pnp_can_disable(). The 
problem is that pnpbios_disable_resources() returns -EPERM if the device is 
not dynamic (!pnpbios_is_dynamic()) but insert_device() happily sets 
PNP_DISABLE capability/flag even if the device is not dynamic. So we try to 
disable non-dynamic devices which will fail. 
This patch prevents insert_device() from setting PNP_DISABLE if the device is 
not dynamic and fixes suspend on my system.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>

--- linux-2.6.17.5-orig/drivers/pnp/pnpbios/core.c	2006-07-15 04:38:43.000000000 +0200
+++ linux-2.6.17.5/drivers/pnp/pnpbios/core.c	2006-07-22 18:44:36.000000000 +0200
@@ -346,7 +346,7 @@
 	dev->flags = node->flags;
 	if (!(dev->flags & PNPBIOS_NO_CONFIG))
 		dev->capabilities |= PNP_CONFIGURABLE;
-	if (!(dev->flags & PNPBIOS_NO_DISABLE))
+	if (!(dev->flags & PNPBIOS_NO_DISABLE) && pnpbios_is_dynamic(dev))
 		dev->capabilities |= PNP_DISABLE;
 	dev->capabilities |= PNP_READ;
 	if (pnpbios_is_dynamic(dev))

-- 
Ondrej Zary
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/