diff options
author | wangyuhang <wangyuhang2014@gmail.com> | 2013-08-30 06:05:10 -0400 |
---|---|---|
committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-16 09:05:53 -0400 |
commit | f8c2746f6e54423f2dd63b73cce2888b075f4e34 (patch) | |
tree | 3de4bed1e7aee70d8de1f30120d1f0fff5494afa /drivers/spi | |
parent | a9c753c326f35c3ad99c0e2121a0839359e64d9e (diff) |
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>
Signed-off-by: Huang Shijie <b32955@freescale.com>
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/spi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 919130135fe4..2a1a797493c4 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
@@ -1482,6 +1482,7 @@ static int __spi_async(struct spi_device *spi, struct spi_message *message) | |||
1482 | return -EINVAL; | 1482 | return -EINVAL; |
1483 | if (xfer->speed_hz && master->max_speed_hz && | 1483 | if (xfer->speed_hz && master->max_speed_hz && |
1484 | xfer->speed_hz > master->max_speed_hz) | 1484 | xfer->speed_hz > master->max_speed_hz) |
1485 | return -EINVAL; | ||
1485 | 1486 | ||
1486 | if (xfer->tx_buf && !xfer->tx_nbits) | 1487 | if (xfer->tx_buf && !xfer->tx_nbits) |
1487 | xfer->tx_nbits = SPI_NBITS_SINGLE; | 1488 | xfer->tx_nbits = SPI_NBITS_SINGLE; |