summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--device.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/device.c b/device.c
index 44541e2..32fa4a4 100644
--- a/device.c
+++ b/device.c
@@ -141,8 +141,11 @@ int device_claim(struct device_user *dep)
ret = dev->set_state(dev, true);
if (ret == 0)
device_broadcast_event(dev, DEV_EVENT_UP);
- else
+ else {
+ D(DEVICE, "claim device %s failed: %d\n", dev->ifname, ret);
dev->active = 0;
+ dep->claimed = false;
+ }
return ret;
}
@@ -259,6 +262,7 @@ void device_cleanup(struct device *dev)
continue;
dep->cb(dep, DEV_EVENT_REMOVE);
+ device_release(dep);
}
device_delete(dev);
@@ -379,8 +383,9 @@ device_replace(struct device *dev, struct device *odev)
device_set_present(odev, false);
list_for_each_entry_safe(dep, tmp, &odev->users, list) {
- device_remove_user(dep);
- device_add_user(dep, dev);
+ device_release(dep);
+ list_move_tail(&dep->list, &dev->users);
+ dep->dev = dev;
}
device_free(odev);