Module Name: src
Committed By: jmcneill
Date: Thu Oct 3 15:10:32 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi: sunxi_mmc.c
Log Message:
Do not print timeout message when SCF_TOUT_OK flag is set
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/sunxi/sunxi_mmc.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/sunxi/sunxi_mmc.c
diff -u src/sys/arch/arm/sunxi/sunxi_mmc.c:1.38 src/sys/arch/arm/sunxi/sunxi_mmc.c:1.39
--- src/sys/arch/arm/sunxi/sunxi_mmc.c:1.38 Thu Oct 3 13:49:33 2019
+++ src/sys/arch/arm/sunxi/sunxi_mmc.c Thu Oct 3 15:10:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_mmc.c,v 1.38 2019/10/03 13:49:33 jmcneill Exp $ */
+/* $NetBSD: sunxi_mmc.c,v 1.39 2019/10/03 15:10:32 jmcneill Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_sunximmc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.38 2019/10/03 13:49:33 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_mmc.c,v 1.39 2019/10/03 15:10:32 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -633,7 +633,8 @@ sunxi_mmc_intr(void *priv)
/* Wait for command to complete */
sc->sc_wait_data = sc->sc_wait_dma = false;
if (cmd->c_opcode != SD_IO_SEND_OP_COND &&
- cmd->c_opcode != SD_IO_RW_DIRECT)
+ cmd->c_opcode != SD_IO_RW_DIRECT &&
+ !ISSET(cmd->c_flags, SCF_TOUT_OK))
device_printf(sc->sc_dev, "host controller timeout, mint=0x%08x\n", mint);
} else {
device_printf(sc->sc_dev, "host controller error, mint=0x%08x\n", mint);
