nvmem: meson-efuse: Fix return value of nvmem callbacks
Subsystems (3)
PATCH 1/1 nvmem: meson-efuse: Fix return value of nvmem callbacks
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.
--- drivers/nvmem/meson-efuse.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
drivers/nvmem/meson-efuse.c +10 -4
@@ -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, - bytes,0 ,0 ,0 ); + 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; + + ret =meson_sm_call_write (fw, (u8 *)val, bytes,SM_EFUSE_WRITE , offset, + bytes,0 ,0 ,0 ); -return 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[] = {
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog
Quoted 41 lines · Joy Chakraborty
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()andmeson_efuse_write()call intomeson_sm_call_read()andmeson_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 a29a63bdaf6f ("nvmem: meson-efuse: simplify read callback")Signed-off-by Joy Chakraborty <[email protected]>--- drivers/nvmem/meson-efuse.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)drivers/nvmem/meson-efuse.c +6
-2@@ -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, - bytes,0 ,0 ,0 ); + 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;
drivers/nvmem/meson-efuse.c static int meson_efuse_read(void *context, unsigned int offset, · line 41
Quoted 10 lines
drivers/nvmem/meson-efuse.c +4
-2+ + ret =meson_sm_call_write (fw, (u8 *)val, bytes,SM_EFUSE_WRITE , offset, + bytes,0 ,0 ,0 ); -return 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[] = {
Quoted 8 lines · Joy Chakraborty
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()andmeson_efuse_write()call intomeson_sm_call_read()andmeson_sm_call_write()respectively which return the number of bytes read or written on success as per their api description.
Quoted 6 lines
Fix to return error if meson_sm_call_read()/meson_sm_call_write() returns an error else return 0.
Fixes a29a63bdaf6f ("nvmem: meson-efuse: simplify read callback")Signed-off-by Joy Chakraborty <[email protected]>
Thanks!
regards,
dan carpenter
Srinivas Kandagatla
AppliedQuoted 9 lines · Joy Chakraborty
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()andmeson_efuse_write()call intomeson_sm_call_read()andmeson_sm_call_write()respectively which return the number of bytes read or written on success as per their api description.[...]
Applied, thanks!
[1/1] nvmem: meson-efuse: Fix return value of nvmem callbacks
commit: c87ba397647e1ad84d2771461a6035a63d388198
Best regards,
Signature · 1 line
Srinivas Kandagatla <[email protected]>