From owner-svn-src-stable@FreeBSD.ORG  Wed Mar 25 10:35:55 2015
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 283DE453;
 Wed, 25 Mar 2015 10:35:55 +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 12589949;
 Wed, 25 Mar 2015 10:35:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2PAZsdt088776;
 Wed, 25 Mar 2015 10:35:54 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2PAZsJb088775;
 Wed, 25 Mar 2015 10:35:54 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201503251035.t2PAZsJb088775@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 25 Mar 2015 10:35:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r280529 - stable/10/sys/dev/usb/input
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Mar 2015 10:35:55 -0000

Author: hselasky
Date: Wed Mar 25 10:35:54 2015
New Revision: 280529
URL: https://svnweb.freebsd.org/changeset/base/280529

Log:
  MFC r279854:
  Lock softc before clearing bits.

Modified:
  stable/10/sys/dev/usb/input/uhid.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/usb/input/uhid.c
==============================================================================
--- stable/10/sys/dev/usb/input/uhid.c	Wed Mar 25 10:35:19 2015	(r280528)
+++ stable/10/sys/dev/usb/input/uhid.c	Wed Mar 25 10:35:54 2015	(r280529)
@@ -518,7 +518,9 @@ uhid_open(struct usb_fifo *fifo, int ffl
 	 */
 	if (fflags & FREAD) {
 		/* reset flags */
+		mtx_lock(&sc->sc_mtx);
 		sc->sc_flags &= ~UHID_FLAG_IMMED;
+		mtx_unlock(&sc->sc_mtx);
 
 		if (usb_fifo_alloc_buffer(fifo,
 		    sc->sc_isize + 1, UHID_FRAME_NUM)) {