This is an automated email from the ASF dual-hosted git repository. xiaoxiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit c8540a1f9ba4b9c567289c6d0d3fc08257db10aa Author: Jani Paalijarvi <[email protected]> AuthorDate: Wed Sep 20 08:16:29 2023 +0300 drivers/net/rpmsgdrv.c: Improve init error handling Signed-off-by: Jani Paalijarvi <[email protected]> --- drivers/net/rpmsgdrv.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/drivers/net/rpmsgdrv.c b/drivers/net/rpmsgdrv.c index b8cf19a6f0..67cf6286f8 100644 --- a/drivers/net/rpmsgdrv.c +++ b/drivers/net/rpmsgdrv.c @@ -1145,14 +1145,30 @@ int net_rpmsg_drv_init(FAR const char *cpuname, /* Register the device with the openamp */ - rpmsg_register_callback(dev, + ret = rpmsg_register_callback(dev, net_rpmsg_drv_device_created, net_rpmsg_drv_device_destroy, NULL, NULL); + if (ret < 0) + { + kmm_free(priv); + return ret; + } + /* Register the device with the OS so that socket IOCTLs can be performed */ ret = netdev_register(dev, lltype); + if (ret < 0) + { + rpmsg_unregister_callback(dev, + net_rpmsg_drv_device_created, + net_rpmsg_drv_device_destroy, + NULL, + NULL); + kmm_free(priv); + } + return ret; }
