Module Name: src
Committed By: martin
Date: Tue Jan 21 19:54:55 UTC 2020
Modified Files:
src/sys/dev/usb [netbsd-9]: ums.c
Log Message:
Fix another patch mishap from ticket #616
To generate a diff of this commit:
cvs rdiff -u -r1.93.2.2 -r1.93.2.3 src/sys/dev/usb/ums.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/ums.c
diff -u src/sys/dev/usb/ums.c:1.93.2.2 src/sys/dev/usb/ums.c:1.93.2.3
--- src/sys/dev/usb/ums.c:1.93.2.2 Tue Jan 21 15:05:51 2020
+++ src/sys/dev/usb/ums.c Tue Jan 21 19:54:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ums.c,v 1.93.2.2 2020/01/21 15:05:51 martin Exp $ */
+/* $NetBSD: ums.c,v 1.93.2.3 2020/01/21 19:54:55 martin Exp $ */
/*
* Copyright (c) 1998, 2017 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.93.2.2 2020/01/21 15:05:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.93.2.3 2020/01/21 19:54:55 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -249,12 +249,6 @@ ums_detach(device_t self, int flags)
if (sc->sc_alwayson)
uhidev_close(&sc->sc_hdev);
- if (sc->sc_alwayson)
- uhidev_close(&sc->sc_hdev);
-
- if (sc->sc_alwayson)
- uhidev_close(&sc->sc_hdev);
-
/* No need to do reference counting of ums, wsmouse has all the goo. */
if (sc->sc_ms.hidms_wsmousedev != NULL)
rv = config_detach(sc->sc_ms.hidms_wsmousedev, flags);
