aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2006-04-18 22:21:50 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-19 09:13:52 -0700
commit73374454558b9caea46a5521fdae312d3d0ed3e1 (patch)
tree67c9aa700fe8bada378e28d136452a898f3082a5 /arch/i386
parentb514d8c77a6ad9c665c74e6ea7827e5c341095db (diff)
downloadkernel_samsung_smdk4412-73374454558b9caea46a5521fdae312d3d0ed3e1.zip
kernel_samsung_smdk4412-73374454558b9caea46a5521fdae312d3d0ed3e1.tar.gz
kernel_samsung_smdk4412-73374454558b9caea46a5521fdae312d3d0ed3e1.tar.bz2
[PATCH] apm: fix Armada laptops again
Fix the "apm: set display: Interface not engaged" error on Armada laptops again. Jordan said: I think this is fine. It seems to me that this may be the fault of one or both of the APM solutions handling this situation in a non-standard way, but since APM is used very little on the Geode, and I have direct access to our BIOS folks, if this problem comes up with a customer again, we'll solve it from the firmware. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org> Cc: "Jordan Crouse" <jordan.crouse@amd.com> Cc: Zachary Amsden <zach@vmware.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/apm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/apm.c b/arch/i386/kernel/apm.c
index da30a37..df0e174 100644
--- a/arch/i386/kernel/apm.c
+++ b/arch/i386/kernel/apm.c
@@ -1079,7 +1079,7 @@ static int apm_console_blank(int blank)
break;
}
- if (error == APM_NOT_ENGAGED && state != APM_STATE_READY) {
+ if (error == APM_NOT_ENGAGED) {
static int tried;
int eng_error;
if (tried++ == 0) {