[src/trunk]: src/sys/dev/usb xhci(4): Don't panic on suspend if previous susp...

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

details:   https://anonhg.NetBSD.org/src/rev/f360b3af73a9
branches:  trunk
changeset: 378098:f360b3af73a9
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Jul 20 11:59:04 2023 +0000

description:
xhci(4): Don't panic on suspend if previous suspend/resume failed.

Trying to resume again probably won't make the situation much worse,
but panicking can definitely make it worse.

XXX pullup-10

diffstat:

 sys/dev/usb/xhci.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 738214441ae2 -r f360b3af73a9 sys/dev/usb/xhci.c
--- a/sys/dev/usb/xhci.c        Thu Jul 20 04:30:39 2023 +0000
+++ b/sys/dev/usb/xhci.c        Thu Jul 20 11:59:04 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xhci.c,v 1.179 2023/06/05 03:44:47 mlelstv Exp $       */
+/*     $NetBSD: xhci.c,v 1.180 2023/07/20 11:59:04 riastradh Exp $     */
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.179 2023/06/05 03:44:47 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.180 2023/07/20 11:59:04 riastradh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -700,7 +700,6 @@ xhci_suspend(device_t self, const pmf_qu
         */
        mutex_enter(&sc->sc_lock);
        KASSERT(sc->sc_suspender == NULL);
-       KASSERT(!sc->sc_suspendresume_failed);
        sc->sc_suspender = curlwp;
        while (sc->sc_command_addr != 0)
                cv_wait(&sc->sc_cmdbusy_cv, &sc->sc_lock);