aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2018-12-31 08:37:29 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2018-12-31 08:37:29 +0000
commitdd4b66d0690007c26cb86edc5686a7d7a255a1e0 (patch)
tree4ef7e60dd268a4d685ea09ff66c4555cdaa8e5b4
parentcab5dcae560231dab06bf93d46e119ae31c6aed5 (diff)
downloadChibiOS-dd4b66d0690007c26cb86edc5686a7d7a255a1e0.tar.gz
ChibiOS-dd4b66d0690007c26cb86edc5686a7d7a255a1e0.tar.bz2
ChibiOS-dd4b66d0690007c26cb86edc5686a7d7a255a1e0.zip
Fixed bug #995.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12503 110e8d01-0319-4d1e-a829-52ad28d1bb01
-rw-r--r--os/hal/src/hal_mmc_spi.c2
-rw-r--r--readme.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/os/hal/src/hal_mmc_spi.c b/os/hal/src/hal_mmc_spi.c
index 1daea1fb6..ab2b8e7aa 100644
--- a/os/hal/src/hal_mmc_spi.c
+++ b/os/hal/src/hal_mmc_spi.c
@@ -492,7 +492,7 @@ bool mmcConnect(MMCDriver *mmcp) {
i = 0;
while (true) {
/*lint -save -e9007 [13.5] Side effect unimportant.*/
- if ((send_command_R1(mmcp, MMCSD_CMD_APP_CMD, 0) == 0x01U) &&
+ if ((send_command_R1(mmcp, MMCSD_CMD_APP_CMD, 0) <= 0x01U) &&
(send_command_R3(mmcp, MMCSD_CMD_APP_OP_COND, 0x400001AAU, r3) == 0x00U)) {
/*lint -restore*/
break;
diff --git a/readme.txt b/readme.txt
index 278c35072..49f38705c 100644
--- a/readme.txt
+++ b/readme.txt
@@ -184,6 +184,8 @@
- EX: Updated LIS302DL to 1.1.0 (backported to 18.2.1).
- EX: Updated LPS25H to 1.1.0 (backported to 18.2.1).
- EX: Updated LSM303DLHC to 1.1.0 (backported to 18.2.1).
+- HAL: Fixed restrictive check in MMC-SPI driver (bug #995)
+ (backported to 18.2.2 and 17.6.5).
- HAL: Fixed misplaced check in STM32 ST driver (bug #994)
(backported to 18.2.2 and 17.6.5).
- OTH: Fixed ARM CMx vectors table without thumb bit set for unused vectors