Module Name: src
Committed By: jmcneill
Date: Tue May 28 00:25:27 UTC 2019
Modified Files:
src/sys/dev/sdmmc: sdmmc_mem.c
Log Message:
If a mem function fails to initialize, set the error flag so sdmmc doesn't try
to use it anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/sdmmc/sdmmc_mem.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/sdmmc_mem.c
diff -u src/sys/dev/sdmmc/sdmmc_mem.c:1.66 src/sys/dev/sdmmc/sdmmc_mem.c:1.67
--- src/sys/dev/sdmmc/sdmmc_mem.c:1.66 Fri Nov 9 14:38:36 2018
+++ src/sys/dev/sdmmc/sdmmc_mem.c Tue May 28 00:25:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc_mem.c,v 1.66 2018/11/09 14:38:36 jmcneill Exp $ */
+/* $NetBSD: sdmmc_mem.c,v 1.67 2019/05/28 00:25:27 jmcneill Exp $ */
/* $OpenBSD: sdmmc_mem.c,v 1.10 2009/01/09 10:55:22 jsg Exp $ */
/*
@@ -45,7 +45,7 @@
/* Routines for SD/MMC memory cards. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.66 2018/11/09 14:38:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc_mem.c,v 1.67 2019/05/28 00:25:27 jmcneill Exp $");
#ifdef _KERNEL_OPT
#include "opt_sdmmc.h"
@@ -589,6 +589,9 @@ sdmmc_mem_init(struct sdmmc_softc *sc, s
else
error = sdmmc_mem_mmc_init(sc, sf);
+ if (error != 0)
+ SET(sf->flags, SFF_ERROR);
+
out:
SDMMC_UNLOCK(sc);
