Module Name: src
Committed By: kiyohara
Date: Mon Sep 20 09:06:03 UTC 2010
Modified Files:
src/sys/dev/sdmmc: sdmmc.c
Log Message:
Clear SMF_CARD_PRESENT, if failed to attach.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/sdmmc/sdmmc.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.c
diff -u src/sys/dev/sdmmc/sdmmc.c:1.2 src/sys/dev/sdmmc/sdmmc.c:1.3
--- src/sys/dev/sdmmc/sdmmc.c:1.2 Tue Apr 6 15:10:09 2010
+++ src/sys/dev/sdmmc/sdmmc.c Mon Sep 20 09:06:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sdmmc.c,v 1.2 2010/04/06 15:10:09 nonaka Exp $ */
+/* $NetBSD: sdmmc.c,v 1.3 2010/09/20 09:06:03 kiyohara Exp $ */
/* $OpenBSD: sdmmc.c,v 1.18 2009/01/09 10:58:38 jsg Exp $ */
/*
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.2 2010/04/06 15:10:09 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdmmc.c,v 1.3 2010/09/20 09:06:03 kiyohara Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -291,6 +291,8 @@
if (!ISSET(sc->sc_flags, SMF_CARD_PRESENT)) {
SET(sc->sc_flags, SMF_CARD_PRESENT);
sdmmc_card_attach(sc);
+ if (!ISSET(sc->sc_flags, SMF_CARD_ATTACHED))
+ CLR(sc->sc_flags, SMF_CARD_PRESENT);
}
} else {
if (ISSET(sc->sc_flags, SMF_CARD_PRESENT)) {
