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/oc_tiny_spi.c | |
| parent | 3c47f2f4871c345c20b9d986b11fec550ef6cc9f (diff) | |
| parent | 1e7133e99e27c4f02998e7eb87fa43424d48152b (diff) | |
Merge branch 'spi' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'drivers/spi/oc_tiny_spi.c')
| -rw-r--r-- | drivers/spi/oc_tiny_spi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/oc_tiny_spi.c b/drivers/spi/oc_tiny_spi.c index fc01fb83a21..6f7b1edd602 100644 --- a/drivers/spi/oc_tiny_spi.c +++ b/drivers/spi/oc_tiny_spi.c @@ -90,13 +90,10 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (!spi_cs_is_valid(bus, cs) || gpio_request(cs, "tiny_spi")) return NULL; - tiny_spi = malloc(sizeof(*tiny_spi)); + tiny_spi = spi_alloc_slave(struct tiny_spi_slave, bus, cs); if (!tiny_spi) return NULL; - memset(tiny_spi, 0, sizeof(*tiny_spi)); - tiny_spi->slave.bus = bus; - tiny_spi->slave.cs = cs; tiny_spi->host = &tiny_spi_host_list[bus]; tiny_spi->mode = mode & (SPI_CPOL | SPI_CPHA); tiny_spi->flg = mode & SPI_CS_HIGH ? 1 : 0; |