[PATCH] spi: altera_spi: fix altera_spi_setup() return error codes

Sascha Hauer s.hauer at pengutronix.de
Mon Apr 7 23:09:29 PDT 2014


On Mon, Apr 07, 2014 at 11:50:39AM +0400, Antony Pavlov wrote:
> Reported-by: Sascha Hauer <s.hauer at pengutronix.de>
> Signed-off-by: Antony Pavlov <antonynpavlov at gmail.com>

Applied. Thanks for fixing this, now there's one place less to copy
wrong code :)

Sascha

> ---
>  drivers/spi/altera_spi.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
> index 8803d9e..983b877 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);
> -- 
> 1.9.0
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



More information about the barebox mailing list