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

Commit 427524ff authored by Joy Chakraborty's avatar Joy Chakraborty Committed by Greg Kroah-Hartman
Browse files

nvmem: meson-efuse: Fix return value of nvmem callbacks 



commit 7a0a6d0a7c805f9380381f4deedffdf87b93f408 upstream.

Read/write callbacks registered with nvmem core expect 0 to be returned
on success and a negative value to be returned on failure.

meson_efuse_read() and meson_efuse_write() call into
meson_sm_call_read() and meson_sm_call_write() respectively which return
the number of bytes read or written on success as per their api
description.

Fix to return error if meson_sm_call_read()/meson_sm_call_write()
returns an error else return 0.

Fixes: a29a63bd ("nvmem: meson-efuse: simplify read callback")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJoy Chakraborty <joychakr@google.com>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20240628113704.13742-3-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db18df89

drivers/nvmem/meson-efuse.c

+10 −4
Original line number Diff line number Diff line
@@ -18,18 +18,24 @@ static int meson_efuse_read(void *context, unsigned int offset, 
			    void *val, size_t bytes)

{

	struct meson_sm_firmware *fw = context;

	int ret;



	return meson_sm_call_read(fw, (u8 *)val, bytes, SM_EFUSE_READ, offset,

	ret = meson_sm_call_read(fw, (u8 *)val, bytes, SM_EFUSE_READ, offset,

				 bytes, 0, 0, 0);



	return ret < 0 ? ret : 0;

}



static int meson_efuse_write(void *context, unsigned int offset,

			     void *val, size_t bytes)

{

	struct meson_sm_firmware *fw = context;

	int ret;



	return meson_sm_call_write(fw, (u8 *)val, bytes, SM_EFUSE_WRITE, offset,

	ret = meson_sm_call_write(fw, (u8 *)val, bytes, SM_EFUSE_WRITE, offset,

				  bytes, 0, 0, 0);



	return ret < 0 ? ret : 0;

}



static const struct of_device_id meson_efuse_match[] = {