Module Name: src
Committed By: skrll
Date: Tue Dec 27 15:21:46 UTC 2016
Modified Files:
src/sys/dev/usb [nick-nhusb]: ucom.c
Log Message:
Fix merge botch
To generate a diff of this commit:
cvs rdiff -u -r1.108.2.33 -r1.108.2.34 src/sys/dev/usb/ucom.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/ucom.c
diff -u src/sys/dev/usb/ucom.c:1.108.2.33 src/sys/dev/usb/ucom.c:1.108.2.34
--- src/sys/dev/usb/ucom.c:1.108.2.33 Tue Dec 27 14:58:07 2016
+++ src/sys/dev/usb/ucom.c Tue Dec 27 15:21:46 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: ucom.c,v 1.108.2.33 2016/12/27 14:58:07 skrll Exp $ */
+/* $NetBSD: ucom.c,v 1.108.2.34 2016/12/27 15:21:46 skrll Exp $ */
/*
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.33 2016/12/27 14:58:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ucom.c,v 1.108.2.34 2016/12/27 15:21:46 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1208,16 +1208,6 @@ ucomparam(struct tty *tp, struct termios
sc->sc_refcnt++;
mutex_exit(&sc->sc_lock);
- mutex_enter(&sc->sc_lock);
- if (sc->sc_dying) {
- DPRINTF("... dying", 0, 0, 0, 0);
- mutex_exit(&sc->sc_lock);
- return EIO;
- }
-
- sc->sc_refcnt++;
- mutex_exit(&sc->sc_lock);
-
/* Check requested parameters. */
if (t->c_ispeed && t->c_ispeed != t->c_ospeed) {
error = EINVAL;
