projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'u-boot/master' into 'u-boot-arm/master'
[oweals/u-boot.git]
/
drivers
/
spi
/
tegra20_sflash.c
diff --git
a/drivers/spi/tegra20_sflash.c
b/drivers/spi/tegra20_sflash.c
index a4e6c9aa3f24485a91d07066b663a5f0969a3a13..9322ce7f64102b61100039feb071716f243ab65e 100644
(file)
--- a/
drivers/spi/tegra20_sflash.c
+++ b/
drivers/spi/tegra20_sflash.c
@@
-127,7
+127,7
@@
struct spi_slave *tegra20_spi_setup_slave(unsigned int bus, unsigned int cs,
return NULL;
}
- spi =
malloc(sizeof(struct tegra_spi_slave)
);
+ spi =
spi_alloc_slave(struct tegra_spi_slave, bus, cs
);
if (!spi) {
printf("SPI error: malloc of SPI structure failed\n");
return NULL;