diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-21 12:52:36 -0400 |
| commit | a748422ee45725e04e1d3792fa19dfa90ddfd116 (patch) | |
| tree | 978e12895468baaa9f7ab2747b9f7d50beaf1717 /arch/i386/kernel/apm.c | |
| parent | c63e31c2cc1ec67372920b5e1aff8204d04dd172 (diff) | |
| parent | f4ffaa452e71495a06376f12f772342bc57051fc (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/i386/kernel/apm.c')
| -rw-r--r-- | arch/i386/kernel/apm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c index da30a374dd4e..df0e1745f189 100644 --- a/arch/i386/kernel/apm.c +++ b/arch/i386/kernel/apm.c | |||
| @@ -1079,7 +1079,7 @@ static int apm_console_blank(int blank) | |||
| 1079 | break; | 1079 | break; |
| 1080 | } | 1080 | } |
| 1081 | 1081 | ||
| 1082 | if (error == APM_NOT_ENGAGED && state != APM_STATE_READY) { | 1082 | if (error == APM_NOT_ENGAGED) { |
| 1083 | static int tried; | 1083 | static int tried; |
| 1084 | int eng_error; | 1084 | int eng_error; |
| 1085 | if (tried++ == 0) { | 1085 | if (tried++ == 0) { |