upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-04-23 15:19:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only clear endpoint stall if status was USBD_STALLED.

Browse source 
This avoids panicing the system by unplugging a hub. The interrupt transfer
would sometimes arrive after the driver had been removed.
This commit is contained in:
Nick Hibma 2001-09-02 09:26:14 +00:00
parent 494e7e3923
commit aa75eeda2f
6 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/dev/usb/ugen.c
View file

@ -861,7 +861,8 @@ ugenintr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status)
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("ugenintr: status=%d\n", status));
usbd_clear_endpoint_stall_async(sce->pipeh);
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sce->pipeh);
return;
}

3
sys/dev/usb/uhid.c
View file

@ -351,7 +351,8 @@ uhid_intr(xfer, addr, status)
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("uhid_intr: status=%d\n", status));
sc->sc_state |= UHID_NEEDCLEAR;
if (status == USBD_STALLED)
sc->sc_state |= UHID_NEEDCLEAR;
return;
}

6
sys/dev/usb/uhub.c
View file

@ -577,10 +577,10 @@ uhub_intr(usbd_xfer_handle xfer, usbd_private_handle addr, usbd_status status)
struct uhub_softc *sc = addr;
DPRINTFN(5,("uhub_intr: sc=%p\n", sc));
if (status != USBD_NORMAL_COMPLETION)
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_ipipe);
usb_needs_explore(sc->sc_hub->bus);
else if (status == USBD_NORMAL_COMPLETION)
usb_needs_explore(sc->sc_hub->bus);
}
#if defined(__FreeBSD__)

3
sys/dev/usb/ukbd.c
View file

@ -700,7 +700,8 @@ ukbd_interrupt(keyboard_t *kbd, void *arg)
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("ukbd_intr: status=%d\n", status));
usbd_clear_endpoint_stall_async(state->ks_intrpipe);
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(state->ks_intrpipe);
return 0;
}

6
sys/dev/usb/umodem.c
View file

@ -479,7 +479,8 @@ umodemwritecb(xfer, priv, status)
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("umodemwritecb: status=%d\n", status));
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
/* XXX we should restart after some delay. */
return;
}
@ -753,7 +754,8 @@ umodemreadcb(xfer, p, status)
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("umodemreadcb: status=%d\n", status));
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_bulkin_pipe);
/* XXX we should restart after some delay. */
return;
}

3
sys/dev/usb/ums.c
View file

@ -421,7 +421,8 @@ ums_intr(xfer, addr, status)
if (status != USBD_NORMAL_COMPLETION) {
DPRINTF(("ums_intr: status=%d\n", status));
usbd_clear_endpoint_stall_async(sc->sc_intrpipe);
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(sc->sc_intrpipe);
return;
}