diff --git a/lib/m2/memset.c b/lib/m2/memset.c
index 2c09ca99..b5ad533e 100644
--- a/lib/m2/memset.c
+++ b/lib/m2/memset.c
@@ -24,11 +24,11 @@ void *
 memset (void *s, int c, int n)
 {
   char *p = s;
-  while (n)
+  while (n != 0)
     {
-      n = n -1;
-      p[0] = c;
-      p = p + 1;
+      n = n - 1;
+      s[0] = c;
+      s = s + 1;
     }
-  return s;
+  return p;
 }