diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-28 11:31:35 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2006-11-28 11:31:35 +0000 |
| commit | a06005f056b7803374e4b3202447163aab154cf2 (patch) | |
| tree | 4f33a5de422d7da8339ea8e128fade74b7707515 /sys/arch/i386 | |
| parent | 97aa98f773204223be6efbf71e194bc8dd8e7c03 (diff) | |
acpi may steal the timer and speedstep functionality, in which case we
cannot io map the device. rest of the attach() functionality is still
safely intact. we simply do not have to warn about mapping failing.
ok kettenis
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/pci/ichpcib.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/arch/i386/pci/ichpcib.c b/sys/arch/i386/pci/ichpcib.c index bd6f67950ee..fd3e5274223 100644 --- a/sys/arch/i386/pci/ichpcib.c +++ b/sys/arch/i386/pci/ichpcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ichpcib.c,v 1.12 2006/11/27 16:27:52 dim Exp $ */ +/* $OpenBSD: ichpcib.c,v 1.13 2006/11/28 11:31:34 deraadt Exp $ */ /* * Copyright (c) 2004 Alexander Yurchenko <grange@openbsd.org> * @@ -136,10 +136,8 @@ ichpcib_attach(struct device *parent, struct device *self, void *aux) sc->sc_pm_iot = pa->pa_iot; pmbase = pci_conf_read(pa->pa_pc, pa->pa_tag, ICH_PMBASE); if (bus_space_map(sc->sc_pm_iot, PCI_MAPREG_IO_ADDR(pmbase), - ICH_PMSIZE, 0, &sc->sc_pm_ioh) != 0) { - printf(": failed to map I/O space"); + ICH_PMSIZE, 0, &sc->sc_pm_ioh) != 0) goto corepcib; - } #ifdef __HAVE_TIMECOUNTER /* Register new timecounter */ |