diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2016-12-05 11:27:43 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-10 08:27:53 +0100 |
| commit | ef66d906a611f99dbbf79d45ab077f788d713b64 (patch) | |
| tree | 5f97da01d0228851502edbfe641bd5732c495b6c /drivers/spi | |
| parent | fed8acd6c0e504cb746db9f15eae085c9a646a6b (diff) | |
| download | barebox-ef66d906a611f99dbbf79d45ab077f788d713b64.tar.gz barebox-ef66d906a611f99dbbf79d45ab077f788d713b64.tar.xz | |
spi: mvebu: fix error handling for transfer problems
When a message transfer fails no further messages are transferred, but
the error value was not propagated to the caller.
Fixes: 5db1a578d6ed ("spi: add Marvell MVEBU SoC SPI driver")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/mvebu_spi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/mvebu_spi.c b/drivers/spi/mvebu_spi.c index 1d619e0eae..e340686bd6 100644 --- a/drivers/spi/mvebu_spi.c +++ b/drivers/spi/mvebu_spi.c @@ -305,14 +305,14 @@ static int mvebu_spi_transfer(struct spi_device *spi, struct spi_message *msg) list_for_each_entry(t, &msg->transfers, transfer_list) { ret = mvebu_spi_do_transfer(spi, t); if (ret) - break; + goto err_transfer; msg->actual_length += t->len; } - ret = mvebu_spi_set_cs(priv, spi->chip_select, spi->mode, false); - if (ret) - return ret; + return mvebu_spi_set_cs(priv, spi->chip_select, spi->mode, false); +err_transfer: + mvebu_spi_set_cs(priv, spi->chip_select, spi->mode, false); return ret; } |