Sat Jan 25 00:03:14 2014 UTC ()

close uhidev only when it was successfully opened.


(mlelstv)

diff -r1.86 -r1.87 src/sys/dev/usb/ums.c

--- src/sys/dev/usb/ums.c 2013/01/05 23:34:19	1.86
+++ src/sys/dev/usb/ums.c 2014/01/25 00:03:14	1.87

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ums.c,v 1.86 2013/01/05 23:34:19 christos Exp $	*/
+/*	$NetBSD: ums.c,v 1.87 2014/01/25 00:03:14 mlelstv Exp $	*/
 /*
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at
  * Carlstedt Research & Technology.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -25,27 +25,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.86 2013/01/05 23:34:19 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ums.c,v 1.87 2014/01/25 00:03:14 mlelstv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/file.h>
 #include <sys/select.h>
 #include <sys/proc.h>
 #include <sys/vnode.h>
 #include <sys/poll.h>
 @@ -448,56 +448,63 @@ ums_intr(struct uhidev *addr, void *ibuf
 		if (sc->sc_wsmousedev != NULL) {
 			s = spltty();
 			wsmouse_input(sc->sc_wsmousedev, buttons, dx, dy, dz,
 			    dw, flags);
 			splx(s);
+		}
+	}
+}
 Static int
 ums_enable(void *v)
+{
 	struct ums_softc *sc = v;
 	int error;
 	DPRINTFN(1,("ums_enable: sc=%p\n", sc));
 	if (sc->sc_dying)
 		return (EIO);
 	if (sc->sc_enabled)
 		return (EBUSY);
 	sc->sc_enabled = 1;
 	sc->sc_buttons = 0;
-	return (uhidev_open(&sc->sc_hdev));
+	error = uhidev_open(&sc->sc_hdev);
 	if (error)
 		sc->sc_enabled = 0;
 	return error;
+}
 Static void
 ums_disable(void *v)
+{
 	struct ums_softc *sc = v;
 	DPRINTFN(1,("ums_disable: sc=%p\n", sc));
 #ifdef DIAGNOSTIC
 	if (!sc->sc_enabled) {
 		printf("ums_disable: not enabled\n");
 		return;
+	}
 #endif
-	sc->sc_enabled = 0;
+	if (sc->sc_enabled) {
-	uhidev_close(&sc->sc_hdev);
+		sc->sc_enabled = 0;
 		uhidev_close(&sc->sc_hdev);
+	}
+}
 Static int
 ums_ioctl(void *v, u_long cmd, void *data, int flag,
     struct lwp * p)
+{
 	struct ums_softc *sc = v;
 	switch (cmd) {
 	case WSMOUSEIO_GTYPE:
 		if (sc->flags & UMS_ABS)
 			*(u_int *)data = WSMOUSE_TYPE_TPANEL;