From owner-p4-projects@FreeBSD.ORG  Fri Dec  8 09:24:38 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 4438C16A417; Fri,  8 Dec 2006 09:24:38 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 05C4E16A407
	for <perforce@freebsd.org>; Fri,  8 Dec 2006 09:24:38 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E78A643C9D
	for <perforce@freebsd.org>; Fri,  8 Dec 2006 09:23:40 +0000 (GMT)
	(envelope-from imp@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 kB89ObUw026138
	for <perforce@freebsd.org>; Fri, 8 Dec 2006 09:24:37 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB89ObVk026135
	for perforce@freebsd.org; Fri, 8 Dec 2006 09:24:37 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 8 Dec 2006 09:24:37 GMT
Message-Id: <200612080924.kB89ObVk026135@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111279 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: Fri, 08 Dec 2006 09:24:38 -0000

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

Change 111279 by imp@imp_lighthouse on 2006/12/08 09:24:13

	Fix EMERGE

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#37 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#37 (text+ko) ====

@@ -342,11 +342,6 @@
 			break;
 	}
 out:;
-	if (err) {
-		WR4(sc, TWI_CR, TWI_CR_STOP);
-		printf("Err is %d\n", err);
-	}
-out:;
 	if (err)
 		WR4(sc, TWI_CR, TWI_CR_STOP);
 	AT91_TWI_UNLOCK(sc);