diff options
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/Makefile | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-tegra11.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index f9329671a5e2..0e2d1ae207cf 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi-sh-sci.o obj-$(CONFIG_SPI_SIRF) += spi-sirf.o obj-$(CONFIG_SPI_TEGRA20_SFLASH) += spi-tegra20-sflash.o obj-$(CONFIG_SPI_TEGRA20_SLINK) += spi-tegra20-slink.o +CFLAGS_spi-tegra11.o = -Werror obj-$(CONFIG_SPI_TEGRA) += spi-tegra11.o obj-$(CONFIG_SPI_TI_SSP) += spi-ti-ssp.o obj-$(CONFIG_SPI_TLE62X0) += spi-tle62x0.o diff --git a/drivers/spi/spi-tegra11.c b/drivers/spi/spi-tegra11.c index f03df900fd55..a37f1ddef758 100644 --- a/drivers/spi/spi-tegra11.c +++ b/drivers/spi/spi-tegra11.c @@ -401,7 +401,7 @@ static unsigned int spi_tegra_read_rx_fifo_to_client_rxbuf( u8 *rx_buf = (u8 *)t->rx_buf + tspi->cur_rx_pos; unsigned i, count; unsigned long x; - unsigned int read_words; + unsigned int read_words = 0; unsigned len; fifo_status = spi_tegra_readl(tspi, SPI_FIFO_STATUS); @@ -639,7 +639,7 @@ static int spi_tegra_data_settings(struct spi_device *spi, { struct spi_tegra_data *tspi = spi_master_get_devdata(spi->master); unsigned long val; - u32 bits_per_word; + u32 bits_per_word = 0; if (t->bits_per_word || spi->bits_per_word) bits_per_word = t->bits_per_word ? t->bits_per_word : |