Module Name: src
Committed By: nonaka
Date: Sat Feb 5 15:29:16 UTC 2011
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_mci.c
Log Message:
do pxamci_intr_done() after pxa2x0_dmac_abort_xfer().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/xscale/pxa2x0_mci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/pxa2x0_mci.c
diff -u src/sys/arch/arm/xscale/pxa2x0_mci.c:1.7 src/sys/arch/arm/xscale/pxa2x0_mci.c:1.8
--- src/sys/arch/arm/xscale/pxa2x0_mci.c:1.7 Thu Oct 7 12:06:09 2010
+++ src/sys/arch/arm/xscale/pxa2x0_mci.c Sat Feb 5 15:29:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_mci.c,v 1.7 2010/10/07 12:06:09 kiyohara Exp $ */
+/* $NetBSD: pxa2x0_mci.c,v 1.8 2011/02/05 15:29:16 nonaka Exp $ */
/* $OpenBSD: pxa2x0_mmc.c,v 1.5 2009/02/23 18:09:55 miod Exp $ */
/*
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.7 2010/10/07 12:06:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.8 2011/02/05 15:29:16 nonaka Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -812,9 +812,6 @@
DPRINTF(9, ("%s: handling MMC_I_DAT_ERR\n",
device_xname(sc->sc_dev)));
sc->sc_cmd->c_error = EIO;
- pxamci_intr_done(sc);
- pxamci_disable_intr(sc, MMC_I_DAT_ERR);
- CLR(status, MMC_I_DAT_ERR);
if (!ISSET(sc->sc_caps, PMC_CAPS_NO_DMA)
&& DMA_ALIGNED(sc->sc_cmd->c_data)) {
if (ISSET(sc->sc_cmd->c_flags, SCF_CMD_READ)) {
@@ -823,6 +820,9 @@
pxa2x0_dmac_abort_xfer(sc->sc_txdx);
}
}
+ pxamci_intr_done(sc);
+ pxamci_disable_intr(sc, MMC_I_DAT_ERR);
+ CLR(status, MMC_I_DAT_ERR);
/* ignore transmission done condition */
if (ISSET(status, MMC_I_DATA_TRAN_DONE)) {
pxamci_disable_intr(sc, MMC_I_DATA_TRAN_DONE);
