X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=0560a708705772cd74ea562179163cc1833c000c;hp=46177a2728cb3488012df7963cf623311a750afa;hb=f196d048107c1c28bf6ddda31f0927a5893e5f3d;hpb=cfeabcaf0e69b02bac6c86edc223d2eb2e2367d3

diff --git a/device.c b/device.c
index 46177a2..0560a70 100644
--- a/device.c
+++ b/device.c
@@ -112,7 +112,6 @@ static void simple_device_free(struct device *dev)
 {
 	if (dev->parent.dev)
 		device_remove_user(&dev->parent);
-	device_cleanup(dev);
 	free(dev);
 }
 
@@ -162,8 +161,6 @@ static void alias_device_free(struct device *dev)
 {
 	struct alias_device *alias;
 
-	device_cleanup(dev);
-
 	alias = container_of(dev, struct alias_device, dev);
 	avl_delete(&aliases, &alias->avl);
 	free(alias);
@@ -469,6 +466,9 @@ void device_add_user(struct device_user *dep, struct device *dev)
 	if (dep->dev)
 		device_remove_user(dep);
 
+	if (!dev)
+		return;
+
 	dep->dev = dev;
 	list_add_tail(&dep->list, &dev->users);
 	if (dep->cb && dev->present) {
@@ -483,6 +483,7 @@ device_free(struct device *dev)
 {
 	__devlock++;
 	free(dev->config);
+	device_cleanup(dev);
 	dev->type->free(dev);
 	__devlock--;
 }