diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-25 16:53:21 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2012-06-25 16:53:21 +0000 |
| commit | 80443125b286868f18342a9e6884a65b3218bf99 (patch) | |
| tree | 3dc14eac430738860b4ca9f9c83c1868adb93f6b /os/hal/src/sdc.c | |
| parent | 1d674cc60375981e361fb9bdce60c4a5adab754f (diff) | |
| download | ChibiOS-80443125b286868f18342a9e6884a65b3218bf99.tar.gz ChibiOS-80443125b286868f18342a9e6884a65b3218bf99.tar.bz2 ChibiOS-80443125b286868f18342a9e6884a65b3218bf99.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4347 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/src/sdc.c')
| -rw-r--r-- | os/hal/src/sdc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/os/hal/src/sdc.c b/os/hal/src/sdc.c index 728f05566..19829f9b8 100644 --- a/os/hal/src/sdc.c +++ b/os/hal/src/sdc.c @@ -230,7 +230,7 @@ bool_t sdcConnect(SDCDriver *sdcp) { #if SDC_MMC_SUPPORT
if ((sdcp->cardmode & SDC_MODE_CARDTYPE_MASK) == SDC_MODE_CARDTYPE_MMC) {
/* TODO: MMC initialization.*/
- return CH_FAILED;
+ goto failed;
}
else
#endif /* SDC_MMC_SUPPORT */
@@ -337,7 +337,7 @@ bool_t sdcDisconnect(SDCDriver *sdcp) { chDbgCheck(sdcp != NULL, "sdcDisconnect");
chSysLock();
- chDbgAssert(sdcp->state == SDC_ACTIVE,
+ chDbgAssert((sdcp->state == SDC_READY) || (sdcp->state == SDC_ACTIVE),
"sdcDisconnect(), #1", "invalid state");
if (sdcp->state == SDC_READY) {
chSysUnlock();
|