[src/netbsd-9]: src/sys/dev/pci Pull up following revision(s) (requested by r...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b11556b5f87b
branches:  netbsd-9
changeset: 963667:b11556b5f87b
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 01 12:48:25 2020 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #748):

        sys/dev/pci/ichsmb.c: revision 1.61

If attach fails, don't panic on detach.

diffstat:

 sys/dev/pci/ichsmb.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r 32eb2ba6f55b -r b11556b5f87b sys/dev/pci/ichsmb.c
--- a/sys/dev/pci/ichsmb.c      Sun Mar 01 12:47:10 2020 +0000
+++ b/sys/dev/pci/ichsmb.c      Sun Mar 01 12:48:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichsmb.c,v 1.60 2018/12/10 06:23:54 jdolecek Exp $     */
+/*     $NetBSD: ichsmb.c,v 1.60.4.1 2020/03/01 12:48:25 martin 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.60.4.1 2020/03/01 12:48:25 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -265,7 +265,8 @@
                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;
 }