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

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

details:   https://anonhg.NetBSD.org/src/rev/26262d615139
branches:  netbsd-9
changeset: 1002274:26262d615139
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 17 15:50:35 2021 +0000

description:
Pull up following revision(s) (requested by jakllsch in ticket #1273):

        sys/dev/pci/xhci_pci.c: revision 1.26

xhci_pci: avoid potential double free of interrupt handles

Found by Kouichi Hashikawa in PR 55855.

diffstat:

 sys/dev/pci/xhci_pci.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r bf13c11eddc0 -r 26262d615139 sys/dev/pci/xhci_pci.c
--- a/sys/dev/pci/xhci_pci.c    Mon May 17 15:48:57 2021 +0000
+++ b/sys/dev/pci/xhci_pci.c    Mon May 17 15:50:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci_pci.c,v 1.21 2019/01/23 06:56:19 msaitoh Exp $    */
+/*     $NetBSD: xhci_pci.c,v 1.21.4.1 2021/05/17 15:50:35 martin Exp $ */
 /*     OpenBSD: xhci_pci.c,v 1.4 2014/07/12 17:38:51 yuo Exp   */
 
 /*
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.21 2019/01/23 06:56:19 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci_pci.c,v 1.21.4.1 2021/05/17 15:50:35 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_xhci_pci.h"
@@ -213,7 +213,7 @@
            xhci_intr, sc, device_xname(sc->sc_dev));
        if (psc->sc_ih == NULL) {
                pci_intr_release(pc, psc->sc_pihp, 1);
-               psc->sc_ih = NULL;
+               psc->sc_pihp = NULL;
                aprint_error_dev(self, "couldn't establish interrupt");
                if (intrstr != NULL)
                        aprint_error(" at %s", intrstr);