From owner-p4-projects@FreeBSD.ORG  Tue Oct  3 20:39:31 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 EF73E16A4EC; Tue,  3 Oct 2006 20:39:30 +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 8B9E816A4E0
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 20:39:30 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 473C743DCB
	for <perforce@freebsd.org>; Tue,  3 Oct 2006 20:39:18 +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 k93KdIHt099394
	for <perforce@freebsd.org>; Tue, 3 Oct 2006 20:39:18 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k93KdHwf099391
	for perforce@freebsd.org; Tue, 3 Oct 2006 20:39:17 GMT
	(envelope-from imp@freebsd.org)
Date: Tue, 3 Oct 2006 20:39:17 GMT
Message-Id: <200610032039.k93KdHwf099391@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 107214 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: Tue, 03 Oct 2006 20:39:31 -0000

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

Change 107214 by imp@imp_lighthouse on 2006/10/03 20:39:06

	Compile nit

Affected files ...

.. //depot/projects/arm/src/sys/arm/at91/at91_mci.c#20 edit
.. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#13 edit

Differences ...

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

@@ -340,7 +340,7 @@
 		WR4(sc, MCI_CMDR, cmdr);
 		WR4(sc, MCI_IER, MCI_SR_ERROR | MCI_SR_CMDRDY);
 		return;
-l	}
+	}
 	if (data->flags & MMC_DATA_READ)
 		cmdr |= MCI_CMDR_TRDIR;
 	if (data->flags & (MMC_DATA_READ | MMC_DATA_WRITE))
@@ -363,9 +363,9 @@
 			if (bus_dmamap_load(sc->dmatag, sc->map, vaddr,
 				block_size, at91_mci_getaddr, &paddr, 0) != 0) {
 				if (req->cmd->flags & STOP_STARTED)
-					req->stop->error = ERR_NO_MEMORY;
+					req->stop->error = MMC_ERR_NO_MEMORY;
 				else
-					req->cmd->error = ERR_NO_MEMORY;
+					req->cmd->error = MMC_ERR_NO_MEMORY;
 				sc->req = NULL;
 				sc->curcmd = NULL;
 				req->done(req);

==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#13 (text+ko) ====

@@ -69,6 +69,7 @@
 #define	MMC_ERR_FIFO	3
 #define	MMC_ERR_FAILED	4
 #define	MMC_ERR_INVALID	5
+#define MMC_ERR_NO_MEMORY 6
 	struct mmc_data	*data;		/* Data segment with cmd */
 	struct mmc_request *mrq;	/* backpointer to request */
 };