d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for the r235558: interrupt output pipe is optional, so fix the driver

Browse Source 
attach and operation when it is absent.

Sponsored by:	iXsystems, Inc.
MFC after:	1 week
This commit is contained in:
Alexander Motin 2012-05-17 22:04:17 +00:00
parent f4b9a05a90
commit 3dfe1a8e49
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/dev/usb/input/uhid.c
View File

@ -362,7 +362,7 @@ static const struct usb_config uhid_config[UHID_N_TRANSFER] = {
.type = UE_INTERRUPT,
.endpoint = UE_ADDR_ANY,
.direction = UE_DIR_OUT,
.flags = {.pipe_bof = 1, },
.flags = {.pipe_bof = 1,.no_pipe_ok = 1, },
.bufsize = UHID_BSIZE,
.callback = &uhid_intr_write_callback,
},
@ -421,7 +421,8 @@ uhid_start_write(struct usb_fifo *fifo)
{
struct uhid_softc *sc = usb_fifo_softc(fifo);
if (sc->sc_flags & UHID_FLAG_IMMED) {
if ((sc->sc_flags & UHID_FLAG_IMMED) ||
sc->sc_xfer[UHID_INTR_DT_WR] == NULL) {
usbd_transfer_start(sc->sc_xfer[UHID_CTRL_DT_WR]);
} else {
usbd_transfer_start(sc->sc_xfer[UHID_INTR_DT_WR]);