[U-Boot] [PATCH] sf: Stop leaking memory

Marek Vasut marex at denx.de
Thu Jun 12 22:53:58 CEST 2014


It's usually a common pattern to free() the memory that we allocated.
Implement this here to stop leaking memory. Also, add a debug output
when BAR configuration fails to follow suit.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Michal Simek <michal.simek at xilinx.com>
Cc: Jagannadha Sutradharudu Teki <jaganna at xilinx.com>
---
 drivers/mtd/spi/sf_ops.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

NOTE: I think we can do without the memory allocation here altogether.
      Is there any upper limit on the number of dummy bytes that can
      go with a SF command? If so, we can just allocate that buffer on
      a stack and be done with it.

diff --git a/drivers/mtd/spi/sf_ops.c b/drivers/mtd/spi/sf_ops.c
index ef91b92..29a7867 100644
--- a/drivers/mtd/spi/sf_ops.c
+++ b/drivers/mtd/spi/sf_ops.c
@@ -398,8 +398,10 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 #endif
 #ifdef CONFIG_SPI_FLASH_BAR
 		bank_sel = spi_flash_bank(flash, read_addr);
-		if (bank_sel < 0)
-			return ret;
+		if (bank_sel < 0) {
+			debug("SF: bank select failed\n");
+			break;
+		}
 #endif
 		remain_len = ((SPI_FLASH_16MB_BOUN << flash->shift) *
 				(bank_sel + 1)) - offset;
@@ -421,6 +423,7 @@ int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
 		data += read_len;
 	}
 
+	free(cmd);
 	return ret;
 }
 
-- 
2.0.0.rc2



More information about the U-Boot mailing list