From owner-svn-src-head@FreeBSD.ORG  Tue Dec 20 03:25:11 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 951BF1065673;
	Tue, 20 Dec 2011 03:25:11 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 844138FC15;
	Tue, 20 Dec 2011 03:25:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pBK3PBgP089269;
	Tue, 20 Dec 2011 03:25:11 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBK3PB4d089267;
	Tue, 20 Dec 2011 03:25:11 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201112200325.pBK3PB4d089267@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 20 Dec 2011 03:25:11 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r228729 - head/sys/dev/gpio
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Dec 2011 03:25:11 -0000

Author: adrian
Date: Tue Dec 20 03:25:11 2011
New Revision: 228729
URL: http://svn.freebsd.org/changeset/base/228729

Log:
  Fix broken locking that I introduced in the previous commit.

Modified:
  head/sys/dev/gpio/gpioiic.c

Modified: head/sys/dev/gpio/gpioiic.c
==============================================================================
--- head/sys/dev/gpio/gpioiic.c	Tue Dec 20 02:49:01 2011	(r228728)
+++ head/sys/dev/gpio/gpioiic.c	Tue Dec 20 03:25:11 2011	(r228729)
@@ -203,11 +203,13 @@ gpioiic_reset(device_t dev, u_char speed
 {
 	struct gpioiic_softc		*sc = device_get_softc(dev);
 
+	GPIOBUS_LOCK_BUS(sc->sc_busdev);
 	GPIOBUS_ACQUIRE_BUS(sc->sc_busdev, sc->sc_dev);
 
 	gpioiic_reset_bus(sc->sc_dev);
 
 	GPIOBUS_RELEASE_BUS(sc->sc_busdev, sc->sc_dev);
+	GPIOBUS_UNLOCK_BUS(sc->sc_busdev);
 
 	return (IIC_ENOADDR);
 }