diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 20:14:44 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-10 20:14:44 -0400 |
commit | 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (patch) | |
tree | 9a90f7160d7a44a8ddb3a51fdaec866e01f1a359 /drivers | |
parent | 0968cf51b6f2ca8a951de4b976370189cf43bbdd (diff) |
ACPI: Allow setting SCI_EN bit in PM1_CONTROL register
This is needed by at least the Mac Mini's, which (incorrectly) come back
from suspend with SCI_EN clear.
Thanks to Frédéric Riss for hunting this down.
Acked-by: Frédéric Riss <frederic.riss@gmail.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <len.brown@intel.com>
Cc: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/hardware/hwregs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/hardware/hwregs.c b/drivers/acpi/hardware/hwregs.c index 3143f36fcec9..fa58c1edce1e 100644 --- a/drivers/acpi/hardware/hwregs.c +++ b/drivers/acpi/hardware/hwregs.c | |||
@@ -665,8 +665,6 @@ acpi_status acpi_hw_register_write(u8 use_lock, u32 register_id, u32 value) | |||
665 | 665 | ||
666 | /* | 666 | /* |
667 | * Perform a read first to preserve certain bits (per ACPI spec) | 667 | * Perform a read first to preserve certain bits (per ACPI spec) |
668 | * | ||
669 | * Note: This includes SCI_EN, we never want to change this bit | ||
670 | */ | 668 | */ |
671 | status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, | 669 | status = acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, |
672 | ACPI_REGISTER_PM1_CONTROL, | 670 | ACPI_REGISTER_PM1_CONTROL, |