aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMao Wenan <maowenan@huawei.com>2019-05-28 16:02:13 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-05-30 14:02:53 -0700
commit9164f336311863d3e9f80840f4a1cce2aee293bd (patch)
treee0690d34e2b099dff69465a6e4eead6dbd7acaae
parentstaging: kpc2000: Change to use DIV_ROUND_UP (diff)
staging: kpc2000: report error status to spi core
There is an error condition that's not reported to the spi core in kp_spi_transfer_one_message(). It should restore status value to m->status, and return it in error path. Signed-off-by: Mao Wenan <maowenan@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/kpc2000/kpc2000_spi.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/kpc2000/kpc2000_spi.c b/drivers/staging/kpc2000/kpc2000_spi.c
index 075ae4fafa7d..628a447642ad 100644
--- a/drivers/staging/kpc2000/kpc2000_spi.c
+++ b/drivers/staging/kpc2000/kpc2000_spi.c
@@ -374,7 +374,7 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)
list_for_each_entry(transfer, &m->transfers, transfer_list) {
if (transfer->tx_buf == NULL && transfer->rx_buf == NULL && transfer->len) {
status = -EINVAL;
- break;
+ goto error;
}
/* transfer */
@@ -412,7 +412,7 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)
if (count != transfer->len) {
status = -EIO;
- break;
+ goto error;
}
}
@@ -430,6 +430,10 @@ kp_spi_transfer_one_message(struct spi_master *master, struct spi_message *m)
/* done work */
spi_finalize_current_message(master);
return 0;
+
+ error:
+ m->status = status;
+ return status;
}
static void