[src/trunk]: src/sys/dev/ic disestablish the interrupt on failure in nvme_q_c...

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

details:   https://anonhg.NetBSD.org/src/rev/f18c45e43805
branches:  trunk
changeset: 446344:f18c45e43805
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Sat Dec 01 08:03:44 2018 +0000

description:
disestablish the interrupt on failure in nvme_q_create()

diffstat:

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

diffs (32 lines):

diff -r 4155141db42e -r f18c45e43805 sys/dev/ic/nvme.c
--- a/sys/dev/ic/nvme.c Sat Dec 01 07:02:23 2018 +0000
+++ b/sys/dev/ic/nvme.c Sat Dec 01 08:03:44 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nvme.c,v 1.39 2018/04/18 10:11:45 nonaka Exp $ */
+/*     $NetBSD: nvme.c,v 1.40 2018/12/01 08:03:44 jdolecek 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.39 2018/04/18 10:11:45 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvme.c,v 1.40 2018/12/01 08:03:44 jdolecek Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1409,7 +1409,13 @@
        if (rv != 0)
                goto fail;
 
+       nvme_ccb_put(sc->sc_admin_q, ccb);
+       return 0;
+
 fail:
+       if (sc->sc_use_mq)
+               sc->sc_intr_disestablish(sc, q->q_id);
+
        nvme_ccb_put(sc->sc_admin_q, ccb);
        return rv;
 }