1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/soc/qcom/qmi_interface.c b/drivers/soc/qcom/qmi_interface.c
index 321982277697..938ca41c56cd 100644
--- a/drivers/soc/qcom/qmi_interface.c
+++ b/drivers/soc/qcom/qmi_interface.c
@@ -639,10 +639,11 @@ int qmi_handle_init(struct qmi_handle *qmi, size_t recv_buf_size,
         if (ops)
                 qmi->ops = *ops;
 
+        /* Make room for the header */
+        recv_buf_size += sizeof(struct qmi_header);
+        /* Must also be sufficient to hold a control packet */
         if (recv_buf_size < sizeof(struct qrtr_ctrl_pkt))
                 recv_buf_size = sizeof(struct qrtr_ctrl_pkt);
-        else
-                recv_buf_size += sizeof(struct qmi_header);
 
         qmi->recv_buf_size = recv_buf_size;
         qmi->recv_buf = kzalloc(recv_buf_size, GFP_KERNEL);