diff --git a/drivers/soc/qcom/qmp-debugfs-client.c b/drivers/soc/qcom/qmp-debugfs-client.c
index 35ce693a0da2..d4dfc40fe535 100644
--- a/drivers/soc/qcom/qmp-debugfs-client.c
+++ b/drivers/soc/qcom/qmp-debugfs-client.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved. */
+/* Copyright (c) 2017-2019, 2021 The Linux Foundation. All rights reserved. */
 
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -48,6 +48,11 @@ static ssize_t aop_msg_write(struct file *file, const char __user *userstr,
 		return len;
 	}
 
+	/*
+	 * Trim the leading and trailing white spaces
+	 */
+	strim(data_pkt[count].buf);
+
 	/*
 	 * Controller expects a 4 byte aligned buffer
 	 */