summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2005-04-25 00:11:21 +0000
committerAdam Jackson <ajax@nwnk.net>2005-04-25 00:11:21 +0000
commit6c37648754c9bd901adecf8d38f9bb46db65efad (patch)
tree1ee05a7e261205ce23a06f7f5198fc2c2319a745
parenta369d390a87ab0189c465be6cfd914e4b9329691 (diff)
Bug #2141: Rework misleading warning message when APM support is
unavailable. (Previous patch on 2005-04-14 changed the wrong message.)
-rw-r--r--hw/xfree86/os-support/linux/lnx_apm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
index b16d51cf9..9ce6f3883 100644
--- a/hw/xfree86/os-support/linux/lnx_apm.c
+++ b/hw/xfree86/os-support/linux/lnx_apm.c
@@ -137,7 +137,8 @@ xf86OSPMOpen(void)
if ((fd = open( APM_DEVICE, O_RDWR )) > -1) {
if (access( APM_PROC, R_OK ) ||
((pfd = open( APM_PROC, O_RDONLY)) == -1)) {
- xf86MsgVerb(X_INFO,3,"No APM support in BIOS or kernel\n");
+ xf86MsgVerb(X_WARNING,3,"Cannot open APM (%s) (%s)\n",
+ APM_PROC, strerror(errno));
close(fd);
return NULL;
} else
@@ -148,8 +149,7 @@ xf86OSPMOpen(void)
xf86MsgVerb(X_INFO,3,"Open APM successful\n");
return lnxCloseAPM;
}
- xf86MsgVerb(X_WARNING,3,"Open APM failed (%s) (%s)\n", APM_DEVICE,
- strerror(errno));
+ xf86MsgVerb(X_INFO,3,"No APM support in BIOS or kernel\n");
return NULL;
}