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

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

details:   https://anonhg.NetBSD.org/src/rev/3ad1552f335d
branches:  netbsd-9
changeset: 1001405:3ad1552f335d
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jan 21 18:22:51 2020 +0000

description:
Pull up following revision(s) (requested by maya in ticket #641):

        sys/dev/dm/device-mapper.c: revision 1.60

dm(8) doesn't cause problems on suspend, don't block it.
Tested by Matthias Petermann, thanks!

diffstat:

 sys/dev/dm/device-mapper.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (32 lines):

diff -r 186ba938781d -r 3ad1552f335d sys/dev/dm/device-mapper.c
--- a/sys/dev/dm/device-mapper.c        Tue Jan 21 17:25:03 2020 +0000
+++ b/sys/dev/dm/device-mapper.c        Tue Jan 21 18:22:51 2020 +0000
@@ -1,4 +1,4 @@
-/*        $NetBSD: device-mapper.c,v 1.40 2018/10/06 14:59:11 mlelstv Exp $ */
+/*        $NetBSD: device-mapper.c,v 1.40.4.1 2020/01/21 18:22:51 martin Exp $ */
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -241,10 +241,11 @@
 static void
 dm_attach(device_t parent, device_t self, void *aux)
 {
-       return;
+
+       if (!pmf_device_register(self, NULL, NULL))
+               aprint_error_dev(self, "couldn't establish power handler\n");
 }
 
-
 /*
  * dm_detach:
  *
@@ -257,6 +258,8 @@
 {
        dm_dev_t *dmv;
 
+       pmf_device_deregister(self);
+
        /* Detach device from global device list */
        if ((dmv = dm_dev_detach(self)) == NULL)
                return ENOENT;