Merge branch 'busybox' into merge

3 files changed, 3 insertions, 5 deletions

diff --git a/scripts/basic/docproc.c b/scripts/basic/docproc.c
index 7f21443c1..720098a23 100644
--- a/scripts/basic/docproc.c
+++ b/scripts/basic/docproc.c
@@ -264,7 +264,7 @@ void singfunc(char * filename, char * line)
         vec[idx++] = KERNELDOC;
         vec[idx++] = DOCBOOK;
 
-        /* Split line up in individual parameters preceeded by FUNCTION */
+        /* Split line up in individual parameters preceded by FUNCTION */
         for (i=0; line[i]; i++) {
                 if (isspace(line[i])) {
                         line[i] = '\0';
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index 303df0be7..8f4ecbd33 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -124,8 +124,7 @@ int conf_read_simple(const char *name)
                 case S_INT:
                 case S_HEX:
                 case S_STRING:
-                        if (sym->user.val)
-                                free(sym->user.val);
+                        free(sym->user.val);
                 default:
                         sym->user.val = NULL;
                         sym->user.tri = no;
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 263091945..13369e6a1 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -79,8 +79,7 @@ struct gstr str_assign(const char *s)
 /* Free storage for growable string */
 void str_free(struct gstr *gs)
 {
-        if (gs->s)
-                free(gs->s);
+        free(gs->s);
         gs->s = NULL;
         gs->len = 0;
 }