Signed-off-by: Sergei Zviagintsev <[email protected]>
---
 ipc/kdbus/names.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ipc/kdbus/names.c b/ipc/kdbus/names.c
index bf44ca3f12b6..6b31b38ac2ad 100644
--- a/ipc/kdbus/names.c
+++ b/ipc/kdbus/names.c
@@ -438,10 +438,7 @@ static void kdbus_name_release_unlocked(struct 
kdbus_name_owner *owner)
                name->activator = NULL;
 
        if (!primary || owner == primary) {
-               next = kdbus_name_entry_first(name);
-               if (!next)
-                       next = name->activator;
-
+               next = kdbus_name_entry_first(name) ?: name->activator;
                if (next) {
                        /* hand to next in queue */
                        next->flags &= ~KDBUS_NAME_IN_QUEUE;
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to