| Message ID | 20211118112211.GF1147@kili (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c7521d3aa2fa7fc785682758c99b5bcae503f6be |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ptp: ocp: Fix a couple NULL vs IS_ERR() checks | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Thu, 18 Nov 2021 14:22:11 +0300 you wrote: > The ptp_ocp_get_mem() function does not return NULL, it returns error > pointers. > > Fixes: 773bda964921 ("ptp: ocp: Expose various resources on the timecard.") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/ptp/ptp_ocp.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) Here is the summary with links: - [net] ptp: ocp: Fix a couple NULL vs IS_ERR() checks https://git.kernel.org/netdev/net/c/c7521d3aa2fa You are awesome, thank you!
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index 34f943c8c9fd..0f1b5a7d2a89 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -1304,10 +1304,11 @@ ptp_ocp_register_ext(struct ptp_ocp *bp, struct ocp_resource *r) if (!ext) return -ENOMEM; - err = -EINVAL; ext->mem = ptp_ocp_get_mem(bp, r); - if (!ext->mem) + if (IS_ERR(ext->mem)) { + err = PTR_ERR(ext->mem); goto out; + } ext->bp = bp; ext->info = r->extra; @@ -1371,8 +1372,8 @@ ptp_ocp_register_mem(struct ptp_ocp *bp, struct ocp_resource *r) void __iomem *mem; mem = ptp_ocp_get_mem(bp, r); - if (!mem) - return -EINVAL; + if (IS_ERR(mem)) + return PTR_ERR(mem); bp_assign_entry(bp, r, mem);
The ptp_ocp_get_mem() function does not return NULL, it returns error pointers. Fixes: 773bda964921 ("ptp: ocp: Expose various resources on the timecard.") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/ptp/ptp_ocp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)