From cf8b91757813560b824f258e57b42f95908948fa Mon Sep 17 00:00:00 2001 From: Tom Knot Date: Wed, 27 Jun 2018 17:06:38 +0200 Subject: [PATCH] Fixed input values being badly backcopied into regmap --- modules/unipi/src/unipi_platform.c | 2 +- version.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/unipi/src/unipi_platform.c b/modules/unipi/src/unipi_platform.c index e8a472b..a3f6ab7 100644 --- a/modules/unipi/src/unipi_platform.c +++ b/modules/unipi/src/unipi_platform.c @@ -1766,11 +1766,11 @@ int neuronspi_regmap_hw_reg_write(void *context, unsigned int reg, unsigned int int write_length, i; write_length = neuronspi_spi_compose_single_register_write(reg, &inp_buf, &outp_buf, (val >> 8)); if (neuronspi_spi_send_message(spi, inp_buf, outp_buf, write_length, n_spi->ideal_frequency, 25, 1, 0)) { + memcpy(&val, &outp_buf[NEURONSPI_HEADER_LENGTH], sizeof(u16)); for (i = 0; i < write_length; i++) { outp_buf[i] = 0; } } - memcpy(&val, &outp_buf[NEURONSPI_HEADER_LENGTH], sizeof(u16)); kfree(inp_buf); kfree(outp_buf); return 0; diff --git a/version.txt b/version.txt index 26d3e6c..658478c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:67(655f219) LatestCommit:Wed Jun 27 16:56:18 CEST 2018 +Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:68(b7675a2) LatestCommit:Wed Jun 27 17:06:39 CEST 2018 -- 2.34.1