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/atmel_spi.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/atmel_spi.c')
-rw-r--r-- | drivers/spi/atmel_spi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index ce7d460855..f4b1bad22e 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c @@ -84,12 +84,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (mode & SPI_CPOL) csrx |= ATMEL_SPI_CSRx_CPOL; - as = malloc(sizeof(struct atmel_spi_slave)); + as = spi_alloc_slave(struct atmel_spi_slave, bus, cs); if (!as) return NULL; - as->slave.bus = bus; - as->slave.cs = cs; as->regs = regs; as->mr = ATMEL_SPI_MR_MSTR | ATMEL_SPI_MR_MODFDIS #if defined(CONFIG_AT91SAM9X5) || defined(CONFIG_AT91SAM9M10G45) |