| Message ID | 20220329160354.4035-1-jonathan.lemon@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8f0588e80e33273c2fa219da4622affab0cdd22f |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ptp: ocp: handle error from nvmem_device_find | expand |
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 29 Mar 2022 09:03:54 -0700 you wrote: > nvmem_device_find returns a valid pointer or IS_ERR(). > Handle this properly. > > Fixes: 0cfcdd1ebcfe ("ptp: ocp: add nvmem interface for accessing eeprom") > Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> > --- > drivers/ptp/ptp_ocp.c | 15 ++++++++------- > 1 file changed, 8 insertions(+), 7 deletions(-) Here is the summary with links: - [net] ptp: ocp: handle error from nvmem_device_find https://git.kernel.org/netdev/net/c/8f0588e80e33 You are awesome, thank you!
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index c3d0fcf609e3..0feaa4b45317 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -1214,10 +1214,9 @@ ptp_ocp_nvmem_device_get(struct ptp_ocp *bp, const void * const tag) static inline void ptp_ocp_nvmem_device_put(struct nvmem_device **nvmemp) { - if (*nvmemp != NULL) { + if (!IS_ERR_OR_NULL(*nvmemp)) nvmem_device_put(*nvmemp); - *nvmemp = NULL; - } + *nvmemp = NULL; } static void @@ -1241,13 +1240,15 @@ ptp_ocp_read_eeprom(struct ptp_ocp *bp) } if (!nvmem) { nvmem = ptp_ocp_nvmem_device_get(bp, tag); - if (!nvmem) - goto out; + if (IS_ERR(nvmem)) { + ret = PTR_ERR(nvmem); + goto fail; + } } ret = nvmem_device_read(nvmem, map->off, map->len, BP_MAP_ENTRY_ADDR(bp, map)); if (ret != map->len) - goto read_fail; + goto fail; } bp->has_eeprom_data = true; @@ -1256,7 +1257,7 @@ ptp_ocp_read_eeprom(struct ptp_ocp *bp) ptp_ocp_nvmem_device_put(&nvmem); return; -read_fail: +fail: dev_err(&bp->pdev->dev, "could not read eeprom: %d\n", ret); goto out; }
nvmem_device_find returns a valid pointer or IS_ERR(). Handle this properly. Fixes: 0cfcdd1ebcfe ("ptp: ocp: add nvmem interface for accessing eeprom") Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com> --- drivers/ptp/ptp_ocp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)