Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/sdmmc/sdhc.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/sdmmc/sdhc.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- src/sys/dev/sdmmc/sdhc.c	2012/07/12 23:07:06	1.20
+++ src/sys/dev/sdmmc/sdhc.c	2012/07/17 05:57:49	1.21
@@ -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 @@ sdhc_intr(void *arg)
 			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. */