aboutsummaryrefslogtreecommitdiffstats
path: root/os/hal/src
diff options
context:
space:
mode:
Diffstat (limited to 'os/hal/src')
-rw-r--r--os/hal/src/sdc.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c
index a7a39c268..08c667df4 100644
--- a/os/hal/src/sdc.c
+++ b/os/hal/src/sdc.c
@@ -169,7 +169,8 @@ bool_t sdcConnect(SDCDriver *sdcp) {
chDbgCheck(sdcp != NULL, "sdcConnect");
chSysLock();
- chDbgAssert(sdcp->state == SDC_READY, "mmcConnect(), #1", "invalid state");
+ chDbgAssert((sdcp->state == SDC_READY) || (sdcp->state == SDC_ACTIVE),
+ "mmcConnect(), #1", "invalid state");
sdcp->state = SDC_CONNECTING;
chSysUnlock();
@@ -302,6 +303,10 @@ bool_t sdcDisconnect(SDCDriver *sdcp) {
chSysLock();
chDbgAssert(sdcp->state == SDC_ACTIVE,
"sdcDisconnect(), #1", "invalid state");
+ if (sdcp->state == SDC_READY) {
+ chSysUnlock();
+ return FALSE;
+ }
sdcp->state = SDC_DISCONNECTING;
chSysUnlock();