summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
authoryongari <yongari@FreeBSD.org>2007-04-06 02:02:07 +0000
committeryongari <yongari@FreeBSD.org>2007-04-06 02:02:07 +0000
commitb65aaf60eca66c27804bf20cc6e6ca80d4f02ac6 (patch)
tree41a21864ac279561c359b01d7f9557b48d6849f3 /sys/dev
parent38142b0ef530808f289a8bc1cdeff1b5fac8eee9 (diff)
downloadFreeBSD-src-b65aaf60eca66c27804bf20cc6e6ca80d4f02ac6.zip
FreeBSD-src-b65aaf60eca66c27804bf20cc6e6ca80d4f02ac6.tar.gz
If we've encountered unrecognized chipset don't access hardware
anymore. Previously it tried to access interrupt register to disable interrupts which could result in hang if the hardware was not properly initialized by system BIOS/ACPI. Tested by: Benjamin Hansmann (benjamin.hansmann AT rub dot de) MFC after: 3 days
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/msk/if_msk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c
index b830cf3..a2bb2c7 100644
--- a/sys/dev/msk/if_msk.c
+++ b/sys/dev/msk/if_msk.c
@@ -1579,8 +1579,8 @@ mskc_attach(device_t dev)
sc->msk_hw_id > CHIP_ID_YUKON_FE) {
device_printf(dev, "unknown device: id=0x%02x, rev=0x%02x\n",
sc->msk_hw_id, sc->msk_hw_rev);
- error = ENXIO;
- goto fail;
+ mtx_destroy(&sc->msk_mtx);
+ return (ENXIO);
}
SYSCTL_ADD_PROC(device_get_sysctl_ctx(dev),
OpenPOWER on IntegriCloud