summaryrefslogtreecommitdiff
path: root/ipc/kdbus/bus.c
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-08 01:01:14 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-09-08 01:01:14 -0300
commite5fd91f1ef340da553f7a79da9540c3db711c937 (patch)
treeb11842027dc6641da63f4bcc524f8678263304a3 /ipc/kdbus/bus.c
parent2a9b0348e685a63d97486f6749622b61e9e3292f (diff)
Linux-libre 4.2-gnu
Diffstat (limited to 'ipc/kdbus/bus.c')
-rw-r--r--ipc/kdbus/bus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/kdbus/bus.c b/ipc/kdbus/bus.c
index a67f825bd..e636d3478 100644
--- a/ipc/kdbus/bus.c
+++ b/ipc/kdbus/bus.c
@@ -167,7 +167,7 @@ static struct kdbus_bus *kdbus_bus_new(struct kdbus_domain *domain,
return b;
exit_unref:
- kdbus_node_deactivate(&b->node);
+ kdbus_node_drain(&b->node);
kdbus_node_unref(&b->node);
return ERR_PTR(ret);
}
@@ -416,11 +416,11 @@ exit:
ret = kdbus_args_clear(&args, ret);
if (ret < 0) {
if (ep) {
- kdbus_node_deactivate(&ep->node);
+ kdbus_node_drain(&ep->node);
kdbus_ep_unref(ep);
}
if (bus) {
- kdbus_node_deactivate(&bus->node);
+ kdbus_node_drain(&bus->node);
kdbus_bus_unref(bus);
}
return ERR_PTR(ret);