rpmsg: zero out rdev field in rpmsg_unregister_endpoint

xiaoxiang781216 · xiaoxiang781216 · commit f5aa98fe7db3 · 2020-05-26T17:53:21.000+08:00
so is_rpmsg_ept_ready can check the validity more easier

Signed-off-by: Xiang Xiao &lt;xiaoxiang@xiaomi.com&gt;
diff --git a/lib/include/openamp/rpmsg.h b/lib/include/openamp/rpmsg.h
@@ -342,8 +342,7 @@ void rpmsg_destroy_ept(struct rpmsg_endpoint *ept);
  */
 static inline unsigned int is_rpmsg_ept_ready(struct rpmsg_endpoint *ept)
 {
-	return (ept->dest_addr != RPMSG_ADDR_ANY) &&
-		(ept->addr != RPMSG_ADDR_ANY);
+	return ept && ept->rdev && ept->dest_addr != RPMSG_ADDR_ANY;
 }
 
 #if defined __cplusplus
diff --git a/lib/rpmsg/rpmsg.c b/lib/rpmsg/rpmsg.c
@@ -183,6 +183,7 @@ static void rpmsg_unregister_endpoint(struct rpmsg_endpoint *ept)
 		rpmsg_release_address(rdev->bitmap, RPMSG_ADDR_BMP_SIZE,
 				      ept->addr);
 	metal_list_del(&ept->node);
+	ept->rdev = NULL;
 	metal_mutex_release(&rdev->lock);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -342,8 +342,7 @@ void rpmsg_destroy_ept(struct rpmsg_endpoint *ept);`
`342`	`342`	`*/`
`343`	`343`	`static inline unsigned int is_rpmsg_ept_ready(struct rpmsg_endpoint *ept)`
`344`	`344`	`{`
`345`		`- return (ept->dest_addr != RPMSG_ADDR_ANY) &&`
`346`		`- (ept->addr != RPMSG_ADDR_ANY);`
	`345`	`+ return ept && ept->rdev && ept->dest_addr != RPMSG_ADDR_ANY;`
`347`	`346`	`}`
`348`	`347`
`349`	`348`	`#if defined __cplusplus`
Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,7 @@ static void rpmsg_unregister_endpoint(struct rpmsg_endpoint *ept)`
`183`	`183`	`rpmsg_release_address(rdev->bitmap, RPMSG_ADDR_BMP_SIZE,`
`184`	`184`	`ept->addr);`
`185`	`185`	`metal_list_del(&ept->node);`
	`186`	`+ ept->rdev = NULL;`
`186`	`187`	`metal_mutex_release(&rdev->lock);`
`187`	`188`	`}`
`188`	`189`