[src/netbsd-8]: src/sys/dev/ic Pull up following revision(s) (requested by no...

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

details:   https://anonhg.NetBSD.org/src/rev/2b4be4a74fa8
branches:  netbsd-8
changeset: 852565:2b4be4a74fa8
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Sep 26 18:23:13 2019 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #1390):

        sys/dev/ic/nvme.c: revision 1.46

nvme(4): Don't attach the device, if namespace not found.

diffstat:

 sys/dev/ic/nvme.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r ba1c79fa6352 -r 2b4be4a74fa8 sys/dev/ic/nvme.c
--- a/sys/dev/ic/nvme.c Thu Sep 26 18:19:26 2019 +0000
+++ b/sys/dev/ic/nvme.c Thu Sep 26 18:23:13 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme.c,v 1.30.2.5 2019/09/25 15:49:16 martin Exp $     */
+/*     $NetBSD: nvme.c,v 1.30.2.6 2019/09/26 18:23:13 martin Exp $     */
 /*     $OpenBSD: nvme.c,v 1.49 2016/04/18 05:59:50 dlg Exp $ */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.5 2019/09/25 15:49:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.30.2.6 2019/09/26 18:23:13 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -397,6 +397,10 @@
                aprint_error_dev(sc->sc_dev, "unable to identify controller\n");
                goto disable;
        }
+       if (sc->sc_nn == 0) {
+               aprint_error_dev(sc->sc_dev, "namespace not found\n");
+               goto disable;
+       }
 
        /* we know how big things are now */
        sc->sc_max_sgl = sc->sc_mdts / sc->sc_mps;