From owner-p4-projects@FreeBSD.ORG  Wed Nov  8 23:02:39 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 64DB716A4EE; Wed,  8 Nov 2006 23:02:39 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A00F516A4D1
	for <perforce@freebsd.org>; Wed,  8 Nov 2006 23:02:38 +0000 (UTC)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 546F243D97
	for <perforce@freebsd.org>; Wed,  8 Nov 2006 23:01:46 +0000 (GMT)
	(envelope-from cognet@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kA8N1beY097308
	for <perforce@freebsd.org>; Wed, 8 Nov 2006 23:01:37 GMT
	(envelope-from cognet@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kA8N1bNG097305
	for perforce@freebsd.org; Wed, 8 Nov 2006 23:01:37 GMT
	(envelope-from cognet@freebsd.org)
Date: Wed, 8 Nov 2006 23:01:37 GMT
Message-Id: <200611082301.kA8N1bNG097305@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cognet@freebsd.org using -f
From: Olivier Houchard <cognet@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109570 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Nov 2006 23:02:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=109570

Change 109570 by cognet@cognet on 2006/11/08 23:01:25

	Spell reg "reg", not "val", or funny things happen and the GPIO gets
	really upset :-)
	
	Pointy hat to:	kevlo

Affected files ...

.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_iic.c#2 (text+ko) ====

@@ -149,11 +149,11 @@
 	reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOER);
 
 	if (val)
-		val |= GPIO_I2C_SDA_BIT;
+		reg |= GPIO_I2C_SDA_BIT;
 	else
-		val &= ~GPIO_I2C_SDA_BIT;
+		reg &= ~GPIO_I2C_SDA_BIT;
 
-	GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, val);
+	GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, reg);
 	DELAY(I2C_DELAY);
 }
 
@@ -170,11 +170,11 @@
 	reg = GPIO_CONF_READ_4(sc, IXP425_GPIO_GPOER);
 
 	if (val)
-		val |= GPIO_I2C_SCL_BIT;
+		reg |= GPIO_I2C_SCL_BIT;
 	else
-		val &= ~GPIO_I2C_SCL_BIT;
+		reg &= ~GPIO_I2C_SCL_BIT;
 
-	GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, val);
+	GPIO_CONF_WRITE_4(sc, IXP425_GPIO_GPOER, reg);
 	DELAY(I2C_DELAY);
 }