drivers/net/rpmsgdrv.c: Improve init error handling

Signed-off-by: Jani Paalijarvi <[email protected]>
tiiuae · Sep 20, 2023 · 4579a77 · 4579a77
1 parent 28a2b2f
commit 4579a77
Showing 1 changed file with 17 additions and 1 deletion.
diff --git 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;
 }