Commit c7521d3a authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

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: 773bda96 ("ptp: ocp: Expose various resources on the timecard.")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0fa68da7

drivers/ptp/ptp_ocp.c

+5 −4
Original line number Diff line number Diff line
@@ -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);