summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-06-30 09:36:52 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-06-30 09:36:52 +0000
commit671ba74178abab3d5affa3c3ac24e84038a350f5 (patch)
tree0ca52e732034b87475aee1759dce70abefb04ae9 /sys
parent40cfcb322e731dceebad7af182f2f103265ea35c (diff)
Instead of failing immediately , check for ENOTTY from the parent (umodem)
ioctl function and fall through to pick up the tty ioctls. ok deraadt beck
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/usb/ucom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/usb/ucom.c b/sys/dev/usb/ucom.c
index eae70ed4ec8..6f58bb6bb7e 100644
--- a/sys/dev/usb/ucom.c
+++ b/sys/dev/usb/ucom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ucom.c,v 1.48 2010/06/28 14:13:35 deraadt Exp $ */
+/* $OpenBSD: ucom.c,v 1.49 2010/06/30 09:36:51 nicm Exp $ */
/* $NetBSD: ucom.c,v 1.49 2003/01/01 00:10:25 thorpej Exp $ */
/*
@@ -650,7 +650,7 @@ ucom_do_ioctl(struct ucom_softc *sc, u_long cmd, caddr_t data,
if (sc->sc_methods->ucom_ioctl != NULL) {
error = sc->sc_methods->ucom_ioctl(sc->sc_parent,
sc->sc_portno, cmd, data, flag, p);
- if (error >= 0)
+ if (error != ENOTTY)
return (error);
}