These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / xtensa / platforms / iss / network.c

diff --git a/kernel/arch/xtensa/platforms/iss/network.c b/kernel/arch/xtensa/platforms/iss/network.c
index 17b1ef3..976a385 100644 (file)
--- a/kernel/arch/xtensa/platforms/iss/network.c
+++ b/kernel/arch/xtensa/platforms/iss/network.c
@@ -105,13 +105,17 @@ static char *split_if_spec(char *str, ...)
 
        va_start(ap, str);
        while ((arg = va_arg(ap, char**)) != NULL) {
-               if (*str == '\0')
+               if (*str == '\0') {
+                       va_end(ap);
                        return NULL;
+               }
                end = strchr(str, ',');
                if (end != str)
                        *arg = str;
-               if (end == NULL)
+               if (end == NULL) {
+                       va_end(ap);
                        return NULL;
+               }
                *end++ = '\0';
                str = end;
        }
@@ -681,6 +685,4 @@ static int iss_net_init(void)
 
        return 1;
 }
-
-module_init(iss_net_init);
-
+device_initcall(iss_net_init);