summaryrefslogtreecommitdiff
path: root/drivers/spi/spi-loopback-test.c
diff options
context:
space:
mode:
authorMartin Sperl <kernel@martin.sperl.org>2015-12-22 21:03:25 +0300
committerMark Brown <broonie@kernel.org>2016-01-05 22:12:47 +0300
commit1e8db97f0e5205c0f6fd20c9a4f38cd871bc467f (patch)
treeef874780b11d5bf3816338791a3566b9db2bdfd7 /drivers/spi/spi-loopback-test.c
parent339ec3ce54e5c7137287dc807555ae69934b2d2a (diff)
downloadlinux-1e8db97f0e5205c0f6fd20c9a4f38cd871bc467f.tar.xz
spi: loopback-test: spi_check_rx_ranges can get always done
The spi_check_rx_ranges can always get executed independent of if we have a real loopback situation. Signed-off-by: Martin Sperl <kernel@martin.sperl.org> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-loopback-test.c')
-rw-r--r--drivers/spi/spi-loopback-test.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/drivers/spi/spi-loopback-test.c b/drivers/spi/spi-loopback-test.c
index 81fa9068df43..7f79a77c4b68 100644
--- a/drivers/spi/spi-loopback-test.c
+++ b/drivers/spi/spi-loopback-test.c
@@ -489,7 +489,18 @@ static int spi_test_check_loopback_result(struct spi_device *spi,
struct spi_transfer *xfer;
u8 rxb, txb;
size_t i;
+ int ret;
+
+ /* checks rx_buffer pattern are valid with loopback or without */
+ ret = spi_check_rx_ranges(spi, msg, rx);
+ if (ret)
+ return ret;
+ /* if we run without loopback, then return now */
+ if (!loopback)
+ return 0;
+
+ /* if applicable to transfer check that rx_buf is equal to tx_buf */
list_for_each_entry(xfer, &msg->transfers, transfer_list) {
/* if there is no rx, then no check is needed */
if (!xfer->rx_buf)
@@ -521,7 +532,7 @@ static int spi_test_check_loopback_result(struct spi_device *spi,
}
}
- return spi_check_rx_ranges(spi, msg, rx);
+ return 0;
mismatch_error:
dev_err(&spi->dev,
@@ -847,10 +858,8 @@ int spi_test_execute_msg(struct spi_device *spi, struct spi_test *test,
goto exit;
}
- /* run rx-tests when in loopback mode */
- if (loopback)
- ret = spi_test_check_loopback_result(spi, msg,
- tx, rx);
+ /* run rx-buffer tests */
+ ret = spi_test_check_loopback_result(spi, msg, tx, rx);
}
/* if requested or on error dump message (including data) */