Merge pull request #21169 from fabian18/pr/mtd_sdmmc_remove_MTD_DRIVE…

…R_FLAG_DIRECT_WRITE {cpu/sam0_common/sam0_sdhc,drivers/mtd}: do not allocate `work_area` twice
RIOT-OS · Feb 19, 2025 · 8bbeba1 · 8bbeba1
2 parents 90a9ddb + 9e7a269
commit 8bbeba1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/cpu/sam0_common/sam0_sdhc/mtd_sdhc.c b/cpu/sam0_common/sam0_sdhc/mtd_sdhc.c
@@ -46,9 +46,11 @@ static int _init(mtd_dev_t *dev)
 
 #if IS_USED(MODULE_MTD_WRITE_PAGE)
     /* TODO: move to MTD layer */
-    dev->work_area = malloc(SD_MMC_BLOCK_SIZE);
-    if (dev->work_area == NULL) {
-        return -ENOMEM;
+    if (!dev->work_area) {
+        dev->work_area = malloc(SD_MMC_BLOCK_SIZE);
+        if (dev->work_area == NULL) {
+            return -ENOMEM;
+        }
     }
     dev->write_size = 1;
 #endif

diff --git a/drivers/mtd/mtd.c b/drivers/mtd/mtd.c
@@ -76,9 +76,11 @@ int mtd_init(mtd_dev_t *mtd)
 
 #ifdef MODULE_MTD_WRITE_PAGE
     if ((mtd->driver->flags & MTD_DRIVER_FLAG_DIRECT_WRITE) == 0) {
-        mtd->work_area = malloc(mtd->pages_per_sector * mtd->page_size);
-        if (mtd->work_area == NULL) {
-            res = -ENOMEM;
+        if (!mtd->work_area) {
+            mtd->work_area = malloc(mtd->pages_per_sector * mtd->page_size);
+            if (mtd->work_area == NULL) {
+                res = -ENOMEM;
+            }
         }
     }
 #endif