diff options
| author | Tom Rini <trini@ti.com> | 2013-06-13 15:18:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-06-13 15:18:35 -0400 |
| commit | f0df254663d44f7fd4b714542bb4602626837465 (patch) | |
| tree | 2b59e4c4caf22cbfe8d59e81306d97f71179b496 /drivers/spi/tegra114_spi.c | |
| parent | 41341221d12341a2ecfb280142d6478071738fc2 (diff) | |
| parent | ea7fcc5aeb10d2cbb5589e91f36b205dcaf4b7a8 (diff) | |
| download | u-boot-imx-f0df254663d44f7fd4b714542bb4602626837465.zip u-boot-imx-f0df254663d44f7fd4b714542bb4602626837465.tar.gz u-boot-imx-f0df254663d44f7fd4b714542bb4602626837465.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/tegra114_spi.c')
| -rw-r--r-- | drivers/spi/tegra114_spi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/tegra114_spi.c b/drivers/spi/tegra114_spi.c index b11a0a1..4d2af48 100644 --- a/drivers/spi/tegra114_spi.c +++ b/drivers/spi/tegra114_spi.c @@ -152,13 +152,11 @@ struct spi_slave *tegra114_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", |