diff --git a/src/backends/meta-input-mapper.c b/src/backends/meta-input-mapper.c
index 013c2a4271a4904b2ef8e174b2e5bddb5d83b7b2..31212e078cb16baa3750f47b0ca3fe3a1bd7341e 100644
--- a/src/backends/meta-input-mapper.c
+++ b/src/backends/meta-input-mapper.c
@@ -249,12 +249,12 @@ match_edid (MetaMapperInputInfo  *input,
     }
   else
     {
-      char **split;
-      int i = 0;
+      int i;
+      g_auto (GStrv) split = NULL;
 
       split = g_strsplit (meta_monitor_get_product (monitor), " ", -1);
 
-      while (split[i])
+      for (i = 0; split[i]; i++)
         {
           if (strcasestr (dev_name, split[i]) != NULL)
             {
@@ -262,8 +262,6 @@ match_edid (MetaMapperInputInfo  *input,
               break;
             }
         }
-
-      g_strfreev (split);
     }
 
   return TRUE;