tipc: split variable assignments out of conditional expressions

[deliverable/linux.git] / net / tipc / bearer.c

diff --git a/net/tipc/bearer.c b/net/tipc/bearer.c
index 040f3ed32ec8bf742d67a16e55095474801ebd6e..e9136f0abe60f93b9f02e694c6ef1c656bdc07a3 100644 (file)
--- a/net/tipc/bearer.c
+++ b/net/tipc/bearer.c
@@ -251,7 +251,8 @@ static int bearer_name_validate(const char *name,
        /* ensure all component parts of bearer name are present */
 
        media_name = name_copy;
-       if ((if_name = strchr(media_name, ':')) == NULL)
+       if_name = strchr(media_name, ':');
+       if (if_name == NULL)
                return 0;
        *(if_name++) = 0;
        media_len = if_name - media_name;