Merge branch 'espressif:master' into main

Jason2866 · web-flow · commit 749d03e4ac21 · 2024-04-09T13:32:25.000+02:00
diff --git a/libraries/SD/src/sd_diskio.cpp b/libraries/SD/src/sd_diskio.cpp
@@ -718,6 +718,7 @@ uint8_t sdcard_uninit(uint8_t pdrv)
     if (pdrv >= FF_VOLUMES || card == NULL) {
         return 1;
     }
+    AcquireSPI lock(card);
     sdTransaction(pdrv, GO_IDLE_STATE, 0, NULL);
     ff_diskio_register(pdrv, NULL);
     s_cards[pdrv] = NULL;

Original file line number	Diff line number	Diff line change
`@@ -718,6 +718,7 @@ uint8_t sdcard_uninit(uint8_t pdrv)`
`718`	`718`	`if (pdrv >= FF_VOLUMES \|\| card == NULL) {`
`719`	`719`	`return 1;`
`720`	`720`	`}`
	`721`	`+ AcquireSPI lock(card);`
`721`	`722`	`sdTransaction(pdrv, GO_IDLE_STATE, 0, NULL);`
`722`	`723`	`ff_diskio_register(pdrv, NULL);`
`723`	`724`	`s_cards[pdrv] = NULL;`