1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index 8f37562e0b11..750626b0e22d 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -2060,22 +2060,28 @@ static void wcn36xx_smd_rsp_process(struct wcn36xx *wcn, void *buf, size_t len)
         case WCN36XX_HAL_OTA_TX_COMPL_IND:
         case WCN36XX_HAL_MISSED_BEACON_IND:
         case WCN36XX_HAL_DELETE_STA_CONTEXT_IND:
-                mutex_lock(&wcn->hal_ind_mutex);
                 msg_ind = kmalloc(sizeof(*msg_ind), GFP_KERNEL);
-                if (msg_ind) {
-                        msg_ind->msg_len = len;
-                        msg_ind->msg = kmalloc(len, GFP_KERNEL);
-                        memcpy(msg_ind->msg, buf, len);
-                        list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);
-                        queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
-                        wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");
+                if (!msg_ind)
+                        goto nomem;
+                msg_ind->msg_len = len;
+                msg_ind->msg = kmalloc(len, GFP_KERNEL);
+                if (!msg_ind->msg) {
+                        kfree(msg_ind);
+nomem:
+                        /*
+                         * FIXME: Do something smarter then just
+                         * printing an error.
+                         */
+                        wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",
+                                    msg_header->msg_type);
+                        break;
                 }
+                memcpy(msg_ind->msg, buf, len);
+                mutex_lock(&wcn->hal_ind_mutex);
+                list_add_tail(&msg_ind->list, &wcn->hal_ind_queue);
+                queue_work(wcn->hal_ind_wq, &wcn->hal_ind_work);
                 mutex_unlock(&wcn->hal_ind_mutex);
-                if (msg_ind)
-                        break;
-                /* FIXME: Do something smarter then just printing an error. */
-                wcn36xx_err("Run out of memory while handling SMD_EVENT (%d)\n",
-                            msg_header->msg_type);
+                wcn36xx_dbg(WCN36XX_DBG_HAL, "indication arrived\n");
                 break;
         default:
                 wcn36xx_err("SMD_EVENT (%d) not supported\n",