diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2023-07-16 09:33:19 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2023-07-16 09:33:19 +0000 |
| commit | bbab6324bd52e9be47050e3da87f99e1daaa29a8 (patch) | |
| tree | 5f0542248ef06af87aed3667f0bfeb0105a49788 | |
| parent | bc1dfd62b33f95455a374b00194195f5d3651201 (diff) | |
When detaching devices when we suspend, we need to continue processing
command completion events. So only return early in xhci_softintr() if
the controller is dead instead of dying. This fixes USB suspend/resume
in Apple M1/M2.
ok mlarkin@, deraadt@
| -rw-r--r-- | sys/dev/usb/xhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/xhci.c b/sys/dev/usb/xhci.c index 518a569240d..8b78d5ff2cb 100644 --- a/sys/dev/usb/xhci.c +++ b/sys/dev/usb/xhci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: xhci.c,v 1.128 2023/01/01 21:45:40 kettenis Exp $ */ +/* $OpenBSD: xhci.c,v 1.129 2023/07/16 09:33:18 kettenis Exp $ */ /* * Copyright (c) 2014-2015 Martin Pieuchot @@ -656,7 +656,7 @@ xhci_softintr(void *v) { struct xhci_softc *sc = v; - if (sc->sc_bus.dying) + if (sc->sc_dead) return; sc->sc_bus.intr_context++; |