[src/trunk]: src/sys/dev/sdmmc Handle interrupt acknowledgement in the SDHC_F...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c4a9329a28f3
branches:  trunk
changeset: 780233:c4a9329a28f3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Jul 17 05:57:49 2012 +0000

description:
Handle interrupt acknowledgement in the SDHC_FLAG_32BIT_ACCESS case in
the same way as non-SDHC_FLAG_32BIT_ACCESS case.

diffstat:

 sys/dev/sdmmc/sdhc.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 67d9f9dc5b25 -r c4a9329a28f3 sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Tue Jul 17 05:47:07 2012 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Tue Jul 17 05:57:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc.c,v 1.20 2012/07/12 23:07:06 jakllsch Exp $       */
+/*     $NetBSD: sdhc.c,v 1.21 2012/07/17 05:57:49 skrll Exp $  */
 /*     $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $        */
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.20 2012/07/12 23:07:06 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.21 2012/07/17 05:57:49 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -1530,10 +1530,10 @@
                        uint32_t xstatus = HREAD4(hp, SDHC_NINTR_STATUS);
                        status = xstatus;
                        error = xstatus >> 16;
-                       status |= (error ? SDHC_ERROR_INTERRUPT : 0);
                        if (!ISSET(status, SDHC_NINTR_STATUS_MASK))
                                continue; /* no interrupt for us */
                        /* Acknowledge the interrupts we are about to handle. */
+                       xstatus |= (error ? SDHC_ERROR_INTERRUPT : 0);
                        HWRITE4(hp, SDHC_NINTR_STATUS, xstatus);
                } else {
                        /* Find out which interrupts are pending. */