| From 26dbad6e4e97dc0c9a90b6fe8cde9f8a1ada8e7e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 18 Nov 2021 14:22:11 +0300 |
| Subject: ptp: ocp: Fix a couple NULL vs IS_ERR() checks |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit c7521d3aa2fa7fc785682758c99b5bcae503f6be ] |
| |
| 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/ptp/ptp_ocp.c | 9 +++++---- |
| 1 file changed, 5 insertions(+), 4 deletions(-) |
| |
| diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c |
| index caf9b37c5eb1e..e238ae8e94709 100644 |
| --- a/drivers/ptp/ptp_ocp.c |
| +++ b/drivers/ptp/ptp_ocp.c |
| @@ -1049,10 +1049,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; |
| @@ -1122,8 +1123,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); |
| |
| -- |
| 2.33.0 |
| |
