From f71f0ccf090f0aeefa9f705f00b5ed5cc419b6ff Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 21 Apr 2011 21:43:59 -0700 Subject: [PATCH] kernel - enable carrier/modem-status for usb serial devices (/dev/ucomX) * Fix an incorrect return code from umodem which was preventing ucom from processing TIOCMGET and other related modem control ioctls. * For the moment comment out a panic condition dealing with an abort sent from an interrupt context. --- sys/bus/usb/ehci.c | 2 ++ sys/bus/usb/ohci.c | 2 ++ sys/dev/usbmisc/umodem/umodem.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/bus/usb/ehci.c b/sys/bus/usb/ehci.c index ec25199cbb..d8cbb16003 100644 --- a/sys/bus/usb/ehci.c +++ b/sys/bus/usb/ehci.c @@ -2343,8 +2343,10 @@ ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) return; } +#if 0 if (xfer->device->bus->intr_context /* || !curproc REMOVED DFly */) panic("ehci_abort_xfer: not in process context"); +#endif /* * If an abort is already in progress then just wait for it to diff --git a/sys/bus/usb/ohci.c b/sys/bus/usb/ohci.c index 2a944d9525..b7d596565a 100644 --- a/sys/bus/usb/ohci.c +++ b/sys/bus/usb/ohci.c @@ -2268,8 +2268,10 @@ ohci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) return; } +#if 0 if (xfer->device->bus->intr_context /* || !curproc REMOVED DFly */) panic("ohci_abort_xfer: not in process context"); +#endif /* * If an abort is already in progress then just wait for it to diff --git a/sys/dev/usbmisc/umodem/umodem.c b/sys/dev/usbmisc/umodem/umodem.c index 458647dd15..c223bf1065 100644 --- a/sys/dev/usbmisc/umodem/umodem.c +++ b/sys/dev/usbmisc/umodem/umodem.c @@ -606,7 +606,7 @@ umodem_ioctl(void *addr, int portno, u_long cmd, caddr_t data, int flag, default: DPRINTF(("umodem_ioctl: unknown\n")); - error = ENOTTY; + error = ENOIOCTL; break; } -- 2.41.0