Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / wilc_msgqueue.c

diff --git a/drivers/staging/wilc1000/wilc_msgqueue.c b/drivers/staging/wilc1000/wilc_msgqueue.c
index d5ebd6d08db771223a5f2702d9a4b9130ff6abcc..0eff121b8291eeefaa7773eb8970d39d959880f3 100644 (file)
--- a/drivers/staging/wilc1000/wilc_msgqueue.c
+++ b/drivers/staging/wilc1000/wilc_msgqueue.c
@@ -56,36 +56,34 @@ int wilc_mq_destroy(WILC_MsgQueueHandle *pHandle)
 int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
                             const void *pvSendBuffer, u32 u32SendBufferSize)
 {
-       int result = 0;
        unsigned long flags;
        Message *pstrMessage = NULL;
 
        if ((!pHandle) || (u32SendBufferSize == 0) || (!pvSendBuffer)) {
                PRINT_ER("pHandle or pvSendBuffer is null\n");
-               result = -EFAULT;
-               goto ERRORHANDLER;
+               return -EFAULT;
        }
 
        if (pHandle->bExiting) {
                PRINT_ER("pHandle fail\n");
-               result = -EFAULT;
-               goto ERRORHANDLER;
+               return -EFAULT;
        }
 
-       spin_lock_irqsave(&pHandle->strCriticalSection, flags);
-
        /* construct a new message */
        pstrMessage = kmalloc(sizeof(Message), GFP_ATOMIC);
        if (!pstrMessage)
                return -ENOMEM;
+
        pstrMessage->u32Length = u32SendBufferSize;
        pstrMessage->pstrNext = NULL;
-       pstrMessage->pvBuffer = kmalloc(u32SendBufferSize, GFP_ATOMIC);
+       pstrMessage->pvBuffer = kmemdup(pvSendBuffer, u32SendBufferSize,
+                                       GFP_ATOMIC);
        if (!pstrMessage->pvBuffer) {
-               result = -ENOMEM;
-               goto ERRORHANDLER;
+               kfree(pstrMessage);
+               return -ENOMEM;
        }
-       memcpy(pstrMessage->pvBuffer, pvSendBuffer, u32SendBufferSize);
+
+       spin_lock_irqsave(&pHandle->strCriticalSection, flags);
 
        /* add it to the message queue */
        if (!pHandle->pstrMessageList) {
@@ -103,14 +101,7 @@ int wilc_mq_send(WILC_MsgQueueHandle *pHandle,
 
        up(&pHandle->hSem);
 
-ERRORHANDLER:
-       /* error occured, free any allocations */
-       if (pstrMessage) {
-               kfree(pstrMessage->pvBuffer);
-               kfree(pstrMessage);
-       }
-
-       return result;
+       return 0;
 }
 
 /*!