staging: wilc1000: return -ENOMEM when kmalloc failed
authorLuis de Bethencourt <luisbg@osg.samsung.com>
Mon, 26 Oct 2015 05:52:50 +0000 (05:52 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 27 Oct 2015 05:26:23 +0000 (14:26 +0900)
The driver is using -1 instead of the -ENOMEM defined macro to specify that
a buffer allocation failed.

Fixes smatch warning and similars:
drivers/staging/wilc1000/host_interface.c:1757 Handle_Key() warn:
returning -1 instead of -ENOMEM is sloppy

Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/wilc1000/host_interface.c

index e5ffe522290754bb42d4a2ff9616e8ab3e1ce70d..930dcba665e52e0004a8ab1fe5ad255a672e264f 100644 (file)
@@ -1754,7 +1754,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
 
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send Key\n");
-                               return -1;
+                               return -ENOMEM;
                        }
 
                        kfree(pstrHostIFkeyAttr->attr.wep.key);
@@ -1776,7 +1776,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
                        pu8keybuf = kmalloc(pstrHostIFkeyAttr->attr.wep.key_len + 2, GFP_KERNEL);
                        if (!pu8keybuf) {
                                PRINT_ER("No buffer to send Key\n");
-                               return -1;
+                               return -ENOMEM;
                        }
                        pu8keybuf[0] = pstrHostIFkeyAttr->attr.wep.index;
                        memcpy(pu8keybuf + 1, &pstrHostIFkeyAttr->attr.wep.key_len, 1);
@@ -1823,7 +1823,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
                        pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
                        if (!pu8keybuf) {
                                PRINT_ER("No buffer to send RxGTK Key\n");
-                               ret = -1;
+                               ret = -ENOMEM;
                                goto _WPARxGtk_end_case_;
                        }
 
@@ -1858,7 +1858,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
                        pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send RxGTK Key\n");
-                               ret = -1;
+                               ret = -ENOMEM;
                                goto _WPARxGtk_end_case_;
                        }
 
@@ -1887,7 +1887,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
 _WPARxGtk_end_case_:
                kfree(pstrHostIFkeyAttr->attr.wpa.key);
                kfree(pstrHostIFkeyAttr->attr.wpa.seq);
-               if (ret == -1)
+               if (ret)
                        return ret;
 
                break;
@@ -1899,7 +1899,7 @@ _WPARxGtk_end_case_:
                        pu8keybuf = kmalloc(PTK_KEY_MSG_LEN + 1, GFP_KERNEL);
                        if (!pu8keybuf) {
                                PRINT_ER("No buffer to send PTK Key\n");
-                               ret = -1;
+                               ret = -ENOMEM;
                                goto _WPAPtk_end_case_;
 
                        }
@@ -1931,7 +1931,7 @@ _WPARxGtk_end_case_:
                        pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL);
                        if (!pu8keybuf) {
                                PRINT_ER("No buffer to send PTK Key\n");
-                               ret = -1;
+                               ret = -ENOMEM;
                                goto _WPAPtk_end_case_;
 
                        }
@@ -1954,7 +1954,7 @@ _WPARxGtk_end_case_:
 
 _WPAPtk_end_case_:
                kfree(pstrHostIFkeyAttr->attr.wpa.key);
-               if (ret == -1)
+               if (ret)
                        return ret;
 
                break;
@@ -1967,7 +1967,7 @@ _WPAPtk_end_case_:
                pu8keybuf = kmalloc((pstrHostIFkeyAttr->attr.pmkid.numpmkid * PMKSA_KEY_LEN) + 1, GFP_KERNEL);
                if (!pu8keybuf) {
                        PRINT_ER("No buffer to send PMKSA Key\n");
-                       return -1;
+                       return -ENOMEM;
                }
 
                pu8keybuf[0] = pstrHostIFkeyAttr->attr.pmkid.numpmkid;