Merge branches 'clockevents/4.4-fixes' and 'clockevents/4.5-fixes' of http://git.linaro.org/people/daniel.lezcano/linux into timers/urgent

Pull in fixes from Daniel Lezcano:

 - Fix the vt8500 timer leading to a system lock up when dealing with too
   small delta (Roman Volkov)

 - Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled with COMPILE_TEST
   (Daniel Lezcano)

 - Prevent to compile timers using the 'iomem' API when the architecture has
   not HAS_IOMEM set (Richard Weinberger)

1 files changed, 6 insertions, 4 deletions

diff --git a/arch/um/drivers/net_user.c b/arch/um/drivers/net_user.c
index e697a4136707..e9f8445861dc 100644
--- a/arch/um/drivers/net_user.c
+++ b/arch/um/drivers/net_user.c
@@ -249,21 +249,23 @@ void close_addr(unsigned char *addr, unsigned char *netmask, void *arg)
 
 char *split_if_spec(char *str, ...)
 {
-        char **arg, *end;
+        char **arg, *end, *ret = NULL;
         va_list ap;
 
         va_start(ap, str);
         while ((arg = va_arg(ap, char **)) != NULL) {
                 if (*str == '\0')
-                        return NULL;
+                        goto out;
                 end = strchr(str, ',');
                 if (end != str)
                         *arg = str;
                 if (end == NULL)
-                        return NULL;
+                        goto out;
                 *end++ = '\0';
                 str = end;
         }
+        ret = str;
+out:
         va_end(ap);
-        return str;
+        return ret;
 }