diff options
| author | Tom Rini <trini@ti.com> | 2013-03-20 14:55:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-03-20 14:55:10 -0400 |
| commit | 8b906a9f0b3fd0d4421e08c4fa62f61a01289611 (patch) | |
| tree | 049acc34fee9692c0c394b8d1697d97257c0a074 /drivers/spi/tegra_slink.c | |
| parent | 3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff) | |
| parent | 1e7133e99e27c4f02998e7eb87fa43424d48152b (diff) | |
| download | blackbird-obmc-uboot-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.gz blackbird-obmc-uboot-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.zip | |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/tegra_slink.c')
| -rw-r--r-- | drivers/spi/tegra_slink.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/tegra_slink.c b/drivers/spi/tegra_slink.c index 2c41fabe28..9da58774db 100644 --- a/drivers/spi/tegra_slink.c +++ b/drivers/spi/tegra_slink.c @@ -81,13 +81,11 @@ struct spi_slave *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; } - spi->slave.bus = bus; - spi->slave.cs = cs; spi->ctrl = &spi_ctrls[bus]; if (!spi->ctrl) { printf("SPI error: could not find controller for bus %d\n", |
