]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
nvmem: core: Handle shift bits in-place if cell->nbits is non-zero
authorAxel Lin <axel.lin@ingics.com>
Wed, 30 Sep 2015 12:35:15 +0000 (13:35 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 4 Oct 2015 11:09:43 +0000 (12:09 +0100)
It's pointless to test (cell->bit_offset || cell->bit_offset).
nvmem_shift_read_buffer_in_place() should be called when
(cell->bit_offset || cell->nbits).

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/nvmem/core.c

index f4af8e5fcd947b910a39a12ea04f646ad45b66b1..676607cb01bbed8dfec74f320dda0a9cf753caaa 100644 (file)
@@ -825,7 +825,7 @@ static int __nvmem_cell_read(struct nvmem_device *nvmem,
                return rc;
 
        /* shift bits in-place */
-       if (cell->bit_offset || cell->bit_offset)
+       if (cell->bit_offset || cell->nbits)
                nvmem_shift_read_buffer_in_place(cell, buf);
 
        *len = cell->bytes;