Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50808bfc authored by Mathieu Malaterre's avatar Mathieu Malaterre Committed by Greg Kroah-Hartman
Browse files

nvmem: properly handle returned value nvmem_reg_read 



Function nvmem_reg_read can return a non zero value indicating an error.
This returned value must be read and error propagated to
nvmem_cell_prepare_write_buffer. Silence the following gcc warning (W=1):

drivers/nvmem/core.c:1093:9: warning: variable 'rc' set but
 not used [-Wunused-but-set-variable]

Signed-off-by: default avatarMathieu Malaterre <malat@debian.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b378c779

drivers/nvmem/core.c

+7 −0
Original line number Diff line number Diff line
@@ -1119,6 +1119,8 @@ static void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell, 


		/* setup the first byte with lsb bits from nvmem */

		rc = nvmem_reg_read(nvmem, cell->offset, &v, 1);

		if (rc)

			goto err;

		*b++ |= GENMASK(bit_offset - 1, 0) & v;



		/* setup rest of the byte if any */
@@ -1137,11 +1139,16 @@ static void *nvmem_cell_prepare_write_buffer(struct nvmem_cell *cell, 
		/* setup the last byte with msb bits from nvmem */

		rc = nvmem_reg_read(nvmem,

				    cell->offset + cell->bytes - 1, &v, 1);

		if (rc)

			goto err;

		*p |= GENMASK(7, (nbits + bit_offset) % BITS_PER_BYTE) & v;



	}



	return buf;

err:

	kfree(buf);

	return ERR_PTR(rc);

}



/**