[src/trunk]: src/sys/dev/sdmmc If there was an error in 32-bit mode, just set...

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

details:   https://anonhg.NetBSD.org/src/rev/40c2478bc13e
branches:  trunk
changeset: 780245:40c2478bc13e
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jul 17 21:35:26 2012 +0000

description:
If there was an error in 32-bit mode, just set ERROR_INTERRUPT otherwise
see if matched anything we care about.

diffstat:

 sys/dev/sdmmc/sdhc.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (32 lines):

diff -r 2f988924bca5 -r 40c2478bc13e sys/dev/sdmmc/sdhc.c
--- a/sys/dev/sdmmc/sdhc.c      Tue Jul 17 20:46:07 2012 +0000
+++ b/sys/dev/sdmmc/sdhc.c      Tue Jul 17 21:35:26 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sdhc.c,v 1.21 2012/07/17 05:57:49 skrll Exp $  */
+/*     $NetBSD: sdhc.c,v 1.22 2012/07/17 21:35:26 matt 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.21 2012/07/17 05:57:49 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.22 2012/07/17 21:35:26 matt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_sdmmc.h"
@@ -1530,10 +1530,11 @@
                        uint32_t xstatus = HREAD4(hp, SDHC_NINTR_STATUS);
                        status = xstatus;
                        error = xstatus >> 16;
-                       if (!ISSET(status, SDHC_NINTR_STATUS_MASK))
+                       if (error)
+                               xstatus |= SDHC_ERROR_INTERRUPT;
+                       else 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. */