Fix platform mode on swsusp

[Pavel Machek]

Hi!

When machine supports both S4 and S4bios, S4bios mode is prefered and
it is not possible to enter S4 by swsusp.  echo platform > disk then
does nothing. This makes S4 take precedence over S4bios if only one of
them would be available as the result.

[As a side note, I believe that 'echo "disk" > state' is wrong
interface for S4bios, as it requires completely different setup from
the user.]

Please apply,
								Pavel

--- clean-mm/drivers/acpi/sleep/main.c	2004-07-28 23:39:47.000000000 +0200
+++ linux-mm/drivers/acpi/sleep/main.c	2004-08-15 18:39:01.000000000 +0200
@@ -217,7 +217,8 @@
 				sleep_states[i] = 1;
 				printk(" S4bios");
 				acpi_pm_ops.pm_disk_mode = PM_DISK_FIRMWARE;
-			} else if (sleep_states[i])
+			} 
+			if (sleep_states[i])
 				acpi_pm_ops.pm_disk_mode = PM_DISK_PLATFORM;
 		}
 	}

-- 
People were complaining that M$ turns users into beta-testers...
...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/