X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=device.c;h=ab9138b3be84f3db9adf19e81f5530c7abf790b2;hp=489c6601de8dfe076436a29615fe2ca7d70a5354;hb=9fe20c8cbc4249c13d6f305adc91f4bc695f7c23;hpb=93ddba72304f8267f8ca63dce2235a154227cd99

diff --git a/device.c b/device.c
index 489c660..ab9138b 100644
--- a/device.c
+++ b/device.c
@@ -312,7 +312,8 @@ void device_release(struct device_user *dep)
 		return;
 
 	device_broadcast_event(dev, DEV_EVENT_TEARDOWN);
-	dev->set_state(dev, false);
+	if (!dep->hotplug)
+		dev->set_state(dev, false);
 	device_broadcast_event(dev, DEV_EVENT_DOWN);
 }
 
@@ -465,6 +466,9 @@ device_set_disabled(struct device *dev, bool value)
 
 void device_add_user(struct device_user *dep, struct device *dev)
 {
+	if (dep->dev)
+		device_remove_user(dep);
+
 	dep->dev = dev;
 	list_add_tail(&dep->list, &dev->users);
 	if (dep->cb && dev->present) {