From owner-svn-src-user@FreeBSD.ORG  Tue Jun  3 21:02:20 2014
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1F21F62F;
 Tue,  3 Jun 2014 21:02:20 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0D08D2A90;
 Tue,  3 Jun 2014 21:02:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53L2JwM084923;
 Tue, 3 Jun 2014 21:02:19 GMT (envelope-from jceel@svn.freebsd.org)
Received: (from jceel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53L2J7J084922;
 Tue, 3 Jun 2014 21:02:19 GMT (envelope-from jceel@svn.freebsd.org)
Message-Id: <201406032102.s53L2J7J084922@svn.freebsd.org>
From: Jakub Wojciech Klama <jceel@FreeBSD.org>
Date: Tue, 3 Jun 2014 21:02:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r267028 - user/jceel/soc2014_evdev/head/sys/dev/usb/input
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2014 21:02:20 -0000

Author: jceel
Date: Tue Jun  3 21:02:19 2014
New Revision: 267028
URL: http://svnweb.freebsd.org/changeset/base/267028

Log:
  Added proper detach, as per HPS request.

Modified:
  user/jceel/soc2014_evdev/head/sys/dev/usb/input/utouch.c

Modified: user/jceel/soc2014_evdev/head/sys/dev/usb/input/utouch.c
==============================================================================
--- user/jceel/soc2014_evdev/head/sys/dev/usb/input/utouch.c	Tue Jun  3 20:59:26 2014	(r267027)
+++ user/jceel/soc2014_evdev/head/sys/dev/usb/input/utouch.c	Tue Jun  3 21:02:19 2014	(r267028)
@@ -249,6 +249,14 @@ detach:
 static int
 utouch_detach(device_t dev)
 {
+	struct utouch_softc *sc = device_get_softc(dev);
+	
+	/* Stop intr transfer if running */
+	utouch_ev_close(sc->sc_evdev, sc);
+
+	evdev_unregister(dev, sc->sc_evdev);
+	usbd_transfer_unsetup(sc->sc_xfer, UTOUCH_N_TRANSFER);
+	mtx_destroy(&sc->sc_mtx);
 	return (0);
 }