projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux/kernel.h: sync min, max, min3, max3 macros with Linux
[platform/kernel/u-boot.git]
/
drivers
/
mtd
/
spi
/
sf_ops.c
diff --git
a/drivers/mtd/spi/sf_ops.c
b/drivers/mtd/spi/sf_ops.c
index
1f1bb36
..
759231f
100644
(file)
--- a/
drivers/mtd/spi/sf_ops.c
+++ b/
drivers/mtd/spi/sf_ops.c
@@
-9,6
+9,7
@@
*/
#include <common.h>
*/
#include <common.h>
+#include <errno.h>
#include <malloc.h>
#include <spi.h>
#include <spi_flash.h>
#include <malloc.h>
#include <spi.h>
#include <spi_flash.h>
@@
-312,10
+313,11
@@
int spi_flash_cmd_write_ops(struct spi_flash *flash, u32 offset,
return ret;
#endif
byte_addr = offset % page_size;
return ret;
#endif
byte_addr = offset % page_size;
- chunk_len = min(len - actual,
page_size - byte_addr
);
+ chunk_len = min(len - actual,
(size_t)(page_size - byte_addr)
);
if (flash->spi->max_write_size)
if (flash->spi->max_write_size)
- chunk_len = min(chunk_len, flash->spi->max_write_size);
+ chunk_len = min(chunk_len,
+ (size_t)flash->spi->max_write_size);
spi_flash_addr(write_addr, cmd);
spi_flash_addr(write_addr, cmd);
@@
-381,8
+383,11
@@
int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
}
cmdsz = SPI_FLASH_CMD_LEN + flash->dummy_byte;
}
cmdsz = SPI_FLASH_CMD_LEN + flash->dummy_byte;
- cmd = malloc(cmdsz);
- memset(cmd, 0, cmdsz);
+ cmd = calloc(1, cmdsz);
+ if (!cmd) {
+ debug("SF: Failed to allocate cmd\n");
+ return -ENOMEM;
+ }
cmd[0] = flash->read_cmd;
while (len) {
cmd[0] = flash->read_cmd;
while (len) {
@@
-417,6
+422,7
@@
int spi_flash_cmd_read_ops(struct spi_flash *flash, u32 offset,
data += read_len;
}
data += read_len;
}
+ free(cmd);
return ret;
}
return ret;
}