Fixed input values being badly backcopied into regmap

diff --git a/modules/unipi/src/unipi_platform.c b/modules/unipi/src/unipi_platform.c
index e8a472bb8ac107fbd0d330c02f9e532788c05a03..a3f6ab7355d07f936a191d0f67d8ce6d89d696e1 100644 (file)
--- 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 26d3e6c39c11e35bd54c2e3b6d9690f50abc042c..658478cc83eaaabfffca6591c17f9a1dfdfba76e 100644 (file)
--- 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