Module Name: src
Committed By: riastradh
Date: Thu Jul 20 11:59:04 UTC 2023
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.179 src/sys/dev/usb/xhci.c:1.180
--- src/sys/dev/usb/xhci.c:1.179 Mon Jun 5 03:44:47 2023
+++ src/sys/dev/usb/xhci.c Thu Jul 20 11:59:04 2023
@@ -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);
