summaryrefslogtreecommitdiff
path: root/pm
diff options
context:
space:
mode:
authorVictor Lowther <victor.lowther@gmail.com>2008-03-17 19:16:19 -0500
committerVictor Lowther <victor.lowther@gmail.com>2008-03-17 19:16:19 -0500
commit2d224fc56941d6c6c65b51d0e9943b331b8e69b8 (patch)
tree5998397b2479517fc2a82fc235126e3b9cbce140 /pm
parent29a615e95956da7bbc925a0d139ea38fa4956530 (diff)
Mask out acpi_sleep settings when --quirk-none is passed.
mbiebl and I have been discussing removing the current behaviour for --quirk-none. This patch retains the behaviour where --quirk-none masks out the other video quirks instead of signalling that no quirks are required.
Diffstat (limited to 'pm')
-rwxr-xr-xpm/module.d/uswsusp2
-rwxr-xr-xpm/sleep.d/99video6
2 files changed, 4 insertions, 4 deletions
diff --git a/pm/module.d/uswsusp b/pm/module.d/uswsusp
index 9c59229..371bb04 100755
--- a/pm/module.d/uswsusp
+++ b/pm/module.d/uswsusp
@@ -27,9 +27,9 @@ get_quirks()
*) continue ;;
esac
done
+ [ $ACPI_SLEEP -ne 0 ] && OPTS="$OPTS --acpi_sleep $ACPI_SLEEP"
# if we were told to ignore quirks, do so.
[ "$QUIRK_NONE" = "true" ] && OPTS=""
- [ $ACPI_SLEEP -ne 0 ] && OPTS="$OPTS --acpi_sleep $ACPI_SLEEP"
}
check_suspend()
diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video
index c20c7fa..6e9bbda 100755
--- a/pm/sleep.d/99video
+++ b/pm/sleep.d/99video
@@ -89,9 +89,9 @@ suspend_video()
{
# 0=nothing, 1=s3_bios, 2=s3_mode, 3=both
local acpi_flag=0
- [ "${QUIRK_S3_BIOS}" = "true" ] && acpi_flag=$(($acpi_flag + 1))
- [ "${QUIRK_S3_MODE}" = "true" ] && acpi_flag=$(($acpi_flag + 2))
- sysctl -w kernel.acpi_video_flags=$acpi_flag
+ quirk "${QUIRK_S3_BIOS}" && acpi_flag=$(($acpi_flag + 1))
+ quirk "${QUIRK_S3_MODE}" && acpi_flag=$(($acpi_flag + 2))
+ [ 0 -ne $acpi_flag ] && sysctl -w kernel.acpi_video_flags=$acpi_flag
quirk "${QUIRK_VBESTATE_RESTORE}" && vbe_savestate
quirk "${QUIRK_VBEMODE_RESTORE}" && vbe_savemode