Module Name: src Committed By: ad Date: Thu Nov 21 17:47:23 UTC 2019
Modified Files: src/sys/dev/pci: ichsmb.c Log Message: If attach fails, don't panic on detach. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.60 src/sys/dev/pci/ichsmb.c:1.61 --- src/sys/dev/pci/ichsmb.c:1.60 Mon Dec 10 06:23:54 2018 +++ src/sys/dev/pci/ichsmb.c Thu Nov 21 17:47:23 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.60 2018/12/10 06:23:54 jdolecek Exp $ */ +/* $NetBSD: ichsmb.c,v 1.61 2019/11/21 17:47:23 ad Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.60 2018/12/10 06:23:54 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.61 2019/11/21 17:47:23 ad Exp $"); #include <sys/param.h> #include <sys/device.h> @@ -265,7 +265,8 @@ ichsmb_detach(device_t self, int flags) sc->sc_pihp = NULL; } - bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_size); + if (sc->sc_size != 0) + bus_space_unmap(sc->sc_iot, sc->sc_ioh, sc->sc_size); return 0; }