[src/nick-nhusb]: src/sys/dev/usb Fix merge botch

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e42fecef7840
branches:  nick-nhusb
changeset: 804722:e42fecef7840
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Dec 27 15:21:46 2016 +0000

description:
Fix merge botch

diffstat:

 sys/dev/usb/ucom.c |  14 ++------------
 1 files changed, 2 insertions(+), 12 deletions(-)

diffs (35 lines):

diff -r 8a625c192fe2 -r e42fecef7840 sys/dev/usb/ucom.c
--- a/sys/dev/usb/ucom.c        Tue Dec 27 14:58:07 2016 +0000
+++ b/sys/dev/usb/ucom.c        Tue Dec 27 15:21:46 2016 +0000
@@ -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 @@
        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;