2 files changed, 6 insertions, 0 deletions

diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index f88d90f20228..28df18dd1147 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -59,6 +59,7 @@ static void conf_message(const char *fmt, ...)
         va_start(ap, fmt);
         if (conf_message_callback)
                 conf_message_callback(fmt, ap);
+        va_end(ap);
 }
 
 const char *conf_get_configname(void)
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 81b0c61bb9e2..2ab91b9b100d 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -77,6 +77,11 @@ while true; do
         esac
 done
 
+if [ "$#" -lt 2 ] ; then
+        usage
+        exit
+fi
+
 INITFILE=$1
 shift;