diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-11-18 14:22:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-11-18 12:12:55 +0000 |
| commit | c7521d3aa2fa7fc785682758c99b5bcae503f6be (patch) | |
| tree | 1d33dbbd0a624680045771f2186ea6fa66fd642f /drivers | |
| parent | 0fa68da72c3be09e06dd833258ee89c33374195f (diff) | |
| download | linux-c7521d3aa2fa7fc785682758c99b5bcae503f6be.tar.bz2 | |
ptp: ocp: Fix a couple NULL vs IS_ERR() checks
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ptp/ptp_ocp.c | 9 |
1 files changed, 5 insertions, 4 deletions
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); |