summaryrefslogtreecommitdiffstats
path: root/drivers/spi/spi.c
diff options
context:
space:
mode:
authorwangyuhang <wangyuhang2014@gmail.com>2013-08-30 12:05:10 +0200
committerMark Brown <broonie@linaro.org>2013-08-30 23:55:32 +0200
commitd5ee722ab942451929ccf5bec4fb41f6d044b5c7 (patch)
tree5b0d051081c0b1fcd2ab868ae870ce34678cfb9e /drivers/spi/spi.c
parentspi: conditional checking of mode and transfer bits. (diff)
downloadlinux-d5ee722ab942451929ccf5bec4fb41f6d044b5c7.tar.xz
linux-d5ee722ab942451929ccf5bec4fb41f6d044b5c7.zip
spi: quad: Fix missing return
Delete a "return" when commit the patch to a new kernel version by mistake. So recover it. Signed-off-by: wangyuhang <wangyuhang2014@gmail.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi/spi.c')
-rw-r--r--drivers/spi/spi.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 50f7fc3ed793..f0a6582061d5 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1463,6 +1463,7 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message)
return -EINVAL;
if (xfer->speed_hz && master->max_speed_hz &&
xfer->speed_hz > master->max_speed_hz)
+ return -EINVAL;
if (xfer->tx_buf && !xfer->tx_nbits)
xfer->tx_nbits = SPI_NBITS_SINGLE;