summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <mbiebl@gmail.com>2009-11-08 17:10:57 +0100
committerMichael Biebl <mbiebl@gmail.com>2009-11-08 17:10:57 +0100
commit898b46860ad7aa509098e3e454e30c2f3d7b4dea (patch)
tree411718e13561491da0c32f898c4f043a172a9a11
parentaa049b6e8d757579c2727a63fd09ee80c3a30ea4 (diff)
parentf66bfc9193862450c64deb55c063171ec3985522 (diff)
Merge branch 'master' into pm-utils-1.2pm-utils-1.2.6
-rw-r--r--man/pm-action.xml2
-rwxr-xr-xpm/sleep.d/99video2
2 files changed, 2 insertions, 2 deletions
diff --git a/man/pm-action.xml b/man/pm-action.xml
index 8c1732e..cf03d38 100644
--- a/man/pm-action.xml
+++ b/man/pm-action.xml
@@ -164,7 +164,7 @@
<refsect1 id="options">
<title>OPTIONS</title>
<para>
- Om most hardware putting the video card in the suspend state and
+ On most hardware putting the video card in the suspend state and
recovering from it needs some special quirk handling.
With the --quirk-* options of the <command>pm-suspend</command> and
<command>pm-suspend-hybrid</command> commands you can select which
diff --git a/pm/sleep.d/99video b/pm/sleep.d/99video
index 957cbc2..29f2f2c 100755
--- a/pm/sleep.d/99video
+++ b/pm/sleep.d/99video
@@ -92,7 +92,7 @@ maybe_chvt()
maybe_deallocvt()
{
- state_exists console || return
+ state_exists console || return 0
chvt $(restorestate console)
deallocvt 63
}