src: Pull up following revision(s) (requested by yamaguchi in ti...

[Repository Conversion <srcmastr%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4559022be8f8
branches:  netbsd-8
changeset: 318247:4559022be8f8
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Apr 16 14:28:23 2018 +0000
description:
Pull up following revision(s) (requested by yamaguchi in ticket #765):

        sys/dev/isa/wbsio.c: revision 1.22

Handle watchdog attachment in the wbsio_rescan() function, where we
take care of other children.

ok knakahara@ and yamaguchi@

diffstat:

 sys/dev/isa/wbsio.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r dd2f0b6e1075 -r 4559022be8f8 sys/dev/isa/wbsio.c
--- a/sys/dev/isa/wbsio.c       Mon Apr 16 14:25:49 2018 +0000
+++ b/sys/dev/isa/wbsio.c       Mon Apr 16 14:28:23 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wbsio.c,v 1.10.10.2 2018/02/19 18:50:35 snj Exp $      */
+/*     $NetBSD: wbsio.c,v 1.10.10.3 2018/04/16 14:28:23 martin Exp $   */
 /*     $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $  */
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis%openbsd.org@localhost>
@@ -284,8 +284,7 @@
        if (!pmf_device_register(self, wbsio_suspend, NULL))
                aprint_error_dev(self, "couldn't establish power handler\n");
 
-       wbsio_wdog_attach(self);
-
+       sc->sc_smw_valid = false;
        wbsio_rescan(self, "wbsio", NULL);
 
 #if NGPIO > 0
@@ -336,6 +335,8 @@
 #endif
        config_search_loc(wbsio_search, self, ifattr, locators, NULL);
 
+       wbsio_wdog_attach(self);
+
        return 0;
 }
 
@@ -799,7 +800,8 @@
        uint16_t devid;
        uint8_t rev;
 
-       sc->sc_smw_valid = false;
+       if (sc->sc_smw_valid)
+               return;         /* watchdog already attached */
 
        wbsio_conf_enable(&sc->sc_conf_lock, sc->sc_iot, sc->sc_ioh);
        devid = wbsio_conf_read(sc->sc_iot, sc->sc_ioh, WBSIO_ID);