Module Name: src
Committed By: mlelstv
Date: Wed Sep 9 08:06:47 UTC 2015
Modified Files:
src/sys/dev/sdmmc: sdhc.c
Log Message:
Don't test flags from error value in status value. Instead test the
error interrupt status.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/dev/sdmmc/sdhc.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/dev/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.85 src/sys/dev/sdmmc/sdhc.c:1.86
--- src/sys/dev/sdmmc/sdhc.c:1.85 Wed Sep 9 08:04:33 2015
+++ src/sys/dev/sdmmc/sdhc.c Wed Sep 9 08:06:47 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.85 2015/09/09 08:04:33 mlelstv Exp $ */
+/* $NetBSD: sdhc.c,v 1.86 2015/09/09 08:06:47 mlelstv 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.85 2015/09/09 08:04:33 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc.c,v 1.86 2015/09/09 08:06:47 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -2223,8 +2223,7 @@ sdhc_intr(void *arg)
* Wake up the blocking process to service command
* related interrupt(s).
*/
- if (ISSET(status, SDHC_COMMAND_COMPLETE|
- SDHC_CMD_TIMEOUT_ERROR|SDHC_DATA_TIMEOUT_ERROR|
+ if (ISSET(status, SDHC_COMMAND_COMPLETE|SDHC_ERROR_INTERRUPT|
SDHC_BUFFER_READ_READY|SDHC_BUFFER_WRITE_READY|
SDHC_TRANSFER_COMPLETE|SDHC_DMA_INTERRUPT)) {
hp->intr_error_status |= error;
