summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-11-28 16:17:58 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-11-28 16:17:58 +0000
commit537abe82bcbbc1e97d59fd0a034424043cec1465 (patch)
tree1b2e43980b34e4e41107b2d05ff38ccb91c0b70b /sys/dev
parent0f1fa2399c6b1eeb5309401fa1ba0dac94ba8179 (diff)
acpi may steal power management functionality, in which case we
cannot io map the device. Bail out without warning. If we want to retain the rgn we could re-enable io and be very very careful. ok deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/amdpm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/amdpm.c b/sys/dev/pci/amdpm.c
index 0cd5a8b70c9..3311ae4812d 100644
--- a/sys/dev/pci/amdpm.c
+++ b/sys/dev/pci/amdpm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdpm.c,v 1.18 2006/09/28 18:19:14 grange Exp $ */
+/* $OpenBSD: amdpm.c,v 1.19 2006/11/28 16:17:57 kettenis Exp $ */
/*
* Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -241,9 +241,9 @@ amdpm_attach(struct device *parent, struct device *self, void *aux)
}
reg = pci_conf_read(pa->pa_pc, pa->pa_tag, AMDPM_PMPTR);
- if (bus_space_map(sc->sc_iot, AMDPM_PMBASE(reg), AMDPM_PMSIZE, 0,
- &sc->sc_ioh)) {
- printf(": failed to map PMxx space\n");
+ if (bus_space_map(sc->sc_iot, AMDPM_PMBASE(reg), AMDPM_PMSIZE,
+ 0, &sc->sc_ioh)) {
+ printf("\n");
return;
}
if (bus_space_subregion(sc->sc_iot, sc->sc_ioh, AMDPM_SMB_REGS,