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/bfin_spi6xx.c | |
parent | 3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff) | |
parent | 1e7133e99e27c4f02998e7eb87fa43424d48152b (diff) | |
download | talos-obmc-uboot-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.tar.gz talos-obmc-uboot-8b906a9f0b3fd0d4421e08c4fa62f61a01289611.zip |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/bfin_spi6xx.c')
-rw-r--r-- | drivers/spi/bfin_spi6xx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/bfin_spi6xx.c b/drivers/spi/bfin_spi6xx.c index fde3447426..c25c4a9aea 100644 --- a/drivers/spi/bfin_spi6xx.c +++ b/drivers/spi/bfin_spi6xx.c @@ -178,12 +178,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, return NULL; } - bss = malloc(sizeof(*bss)); + bss = spi_alloc_slave(struct bfin_spi_slave, bus, cs); if (!bss) return NULL; - bss->slave.bus = bus; - bss->slave.cs = cs; bss->regs = (struct bfin_spi_regs *)reg_base; bss->control = SPI_CTL_EN | SPI_CTL_MSTR; if (mode & SPI_CPHA) |