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

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

details:   https://anonhg.NetBSD.org/src/rev/3d04ce17111f
branches:  netbsd-6
changeset: 776707:3d04ce17111f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Sep 29 18:33:21 2014 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #1123):
        sys/dev/pci/ichsmb.c: revision 1.37
Register a null pmf handler even if we failed to attach.
Keeps ichsmb(4) from preventing suspend even if it's broken because
of ichlpcib(4) grodiness.

diffstat:

 sys/dev/pci/ichsmb.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (44 lines):

diff -r 6afa522b2d97 -r 3d04ce17111f sys/dev/pci/ichsmb.c
--- a/sys/dev/pci/ichsmb.c      Mon Sep 29 18:28:15 2014 +0000
+++ b/sys/dev/pci/ichsmb.c      Mon Sep 29 18:33:21 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ichsmb.c,v 1.27 2012/02/14 15:08:07 pgoyette Exp $     */
+/*     $NetBSD: ichsmb.c,v 1.27.2.1 2014/09/29 18:33:21 msaitoh 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.27 2012/02/14 15:08:07 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ichsmb.c,v 1.27.2.1 2014/09/29 18:33:21 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -135,14 +135,14 @@
 
        if ((conf & LPCIB_SMB_HOSTC_HSTEN) == 0) {
                aprint_error_dev(self, "SMBus disabled\n");
-               return;
+               goto out;
        }
 
        /* Map I/O space */
        if (pci_mapreg_map(pa, LPCIB_SMB_BASE, PCI_MAPREG_TYPE_IO, 0,
            &sc->sc_iot, &sc->sc_ioh, NULL, &iosize)) {
                aprint_error_dev(self, "can't map I/O space\n");
-               return;
+               goto out;
        }
 
        sc->sc_poll = 1;
@@ -177,7 +177,7 @@
        iba.iba_tag = &sc->sc_i2c_tag;
        config_found(self, &iba, iicbus_print);
 
-       if (!pmf_device_register(self, NULL, NULL))
+out:   if (!pmf_device_register(self, NULL, NULL))
                aprint_error_dev(self, "couldn't establish power handler\n");
 }