diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:32:37 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-05 13:32:37 +0200 |
| commit | bf1d71d5e192e242c7ce7cdb3d4c70c6a7ae4858 (patch) | |
| tree | 13fdb2d07e850768429dc87c00a0943d7e18ff18 /drivers/spi | |
| parent | 8fb1d4e0758fbeb91dd82541f7c769e2d1e6900a (diff) | |
| parent | 7af9c3a84384b4330ba961ea5bf3a7a79d8ad1f1 (diff) | |
| download | barebox-bf1d71d5e192e242c7ce7cdb3d4c70c6a7ae4858.tar.gz barebox-bf1d71d5e192e242c7ce7cdb3d4c70c6a7ae4858.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/altera_spi.c | 6 | ||||
| -rw-r--r-- | drivers/spi/imx_spi.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c index 8803d9e96b..983b877e87 100644 --- a/drivers/spi/altera_spi.c +++ b/drivers/spi/altera_spi.c @@ -34,18 +34,18 @@ static int altera_spi_setup(struct spi_device *spi) if (spi->bits_per_word != altera_spi->databits) { dev_err(master->dev, " master doesn't support %d bits per word requested by %s\n", spi->bits_per_word, spi_dev.name); - return -1; + return -EINVAL; } if ((spi->mode & (SPI_CPHA | SPI_CPOL)) != altera_spi->mode) { dev_err(master->dev, " master doesn't support SPI_MODE%d requested by %s\n", spi->mode & (SPI_CPHA | SPI_CPOL), spi_dev.name); - return -1; + return -EINVAL; } if (spi->max_speed_hz < altera_spi->speed) { dev_err(master->dev, " frequency is too high for %s\n", spi_dev.name); - return -1; + return -EINVAL; } altera_spi_cs_inactive(spi); diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index bd8fe357ec..e07cf1a95a 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -423,7 +423,7 @@ static void imx_spi_do_transfer(struct spi_device *spi, struct spi_transfer *t) static int imx_spi_transfer(struct spi_device *spi, struct spi_message *mesg) { struct imx_spi *imx = container_of(spi->master, struct imx_spi, master); - struct spi_transfer *t = NULL; + struct spi_transfer *t; imx->chipselect(spi, 1); |