From owner-svn-src-head@FreeBSD.ORG  Sat Oct 18 18:27:25 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 4CA1317F;
 Sat, 18 Oct 2014 18:27:25 +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 38FE4C56;
 Sat, 18 Oct 2014 18:27:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9IIRPji085850;
 Sat, 18 Oct 2014 18:27:25 GMT (envelope-from loos@FreeBSD.org)
Received: (from loos@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9IIRPMW085849;
 Sat, 18 Oct 2014 18:27:25 GMT (envelope-from loos@FreeBSD.org)
Message-Id: <201410181827.s9IIRPMW085849@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: loos set sender to loos@FreeBSD.org
 using -f
From: Luiz Otavio O Souza <loos@FreeBSD.org>
Date: Sat, 18 Oct 2014 18:27:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273263 - head/sys/arm/ti
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
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/options/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: Sat, 18 Oct 2014 18:27:25 -0000

Author: loos
Date: Sat Oct 18 18:27:24 2014
New Revision: 273263
URL: https://svnweb.freebsd.org/changeset/base/273263

Log:
  Fix the chan address for mtx_sleep() on bus wait.  Without this fix the
  threads waiting for the bus would never wake.
  
  X-MFC-With: r270230

Modified:
  head/sys/arm/ti/ti_i2c.c

Modified: head/sys/arm/ti/ti_i2c.c
==============================================================================
--- head/sys/arm/ti/ti_i2c.c	Sat Oct 18 17:51:34 2014	(r273262)
+++ head/sys/arm/ti/ti_i2c.c	Sat Oct 18 18:27:24 2014	(r273263)
@@ -380,7 +380,7 @@ ti_i2c_transfer(device_t dev, struct iic
 
 	/* If the controller is busy wait until it is available. */
 	while (sc->sc_bus_inuse == 1)
-		mtx_sleep(dev, &sc->sc_mtx, 0, "i2cbuswait", 0);
+		mtx_sleep(sc, &sc->sc_mtx, 0, "i2cbuswait", 0);
 
 	/* Now we have control over the I2C controller. */
 	sc->sc_bus_inuse = 1;