Skip to contentSkip to conversation

nvmem: core: Handle shift bits in-place if cell->nbits is non-zero

PATCH In review Axel Lin 2 participants 2 messages Sep 18, 2015 NVMEM framework

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH 1/1 nvmem: core: Handle shift bits in-place if cell->nbits is non-zero

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).

---
 drivers/nvmem/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/core.c +1 -1
index d3c6676..c39723a 100644
@@ -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;
Signature · 1 line
2.1.4
Acked-by on v1 1/1
#1 lore raw

Hi Axel,
Thanks for the patch

I remember fixing this sometime back which was reported by static checker reported by Dan Carpenter, I forgot to send it over to wider audience. Thanks for reminding.

--srini

Quoted 23 lines · Axel Lin

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).

---
  drivers/nvmem/core.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/nvmem/core.c +1 -1
index d3c6676..c39723a 100644
@@ -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;