summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-06-24 13:54:43 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-06-24 13:54:43 +0000
commit5bb31a391d9f173b586ccab1469595f4841e511c (patch)
tree2988956a8f831743b7243077a65795857cfaf8b2 /sys/arch
parentc4ef63561f47f6fa0bd8c48acd861fd5da3a19f0 (diff)
There are 3 reasons why the first block in apm_probe can fail, and in one
case it is not OK to DPRINTF, so delete that code. Found by dhill ok marco dhill
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/i386/apm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/i386/i386/apm.c b/sys/arch/i386/i386/apm.c
index 2821b2ad42f..8ec835e69ef 100644
--- a/sys/arch/i386/i386/apm.c
+++ b/sys/arch/i386/i386/apm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: apm.c,v 1.83 2009/02/26 17:19:47 oga Exp $ */
+/* $OpenBSD: apm.c,v 1.84 2009/06/24 13:54:42 deraadt Exp $ */
/*-
* Copyright (c) 1998-2001 Michael Shalayeff. All rights reserved.
@@ -750,10 +750,8 @@ apmprobe(struct device *parent, void *match, void *aux)
bus_space_handle_t ch, dh;
if (apm_cd.cd_ndevs || strcmp(ba->ba_name, "apm") ||
- !(ba->ba_apmp->apm_detail & APM_32BIT_SUPPORTED)) {
- DPRINTF(("%s: %x\n", ba->ba_name, ba->ba_apmp->apm_detail));
+ !(ap->apm_detail & APM_32BIT_SUPPORTED))
return 0;
- }
/* addresses check
since pc* console and vga* probes much later