These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / rtl8188eu / os_dep / osdep_service.c

diff --git a/kernel/drivers/staging/rtl8188eu/os_dep/osdep_service.c b/kernel/drivers/staging/rtl8188eu/os_dep/osdep_service.c
index abcb3a8..466cd76 100644 (file)
--- a/kernel/drivers/staging/rtl8188eu/os_dep/osdep_service.c
+++ b/kernel/drivers/staging/rtl8188eu/os_dep/osdep_service.c
@@ -52,7 +52,7 @@ void *rtw_malloc2d(int h, int w, int size)
        int j;
 
        void **a = kzalloc(h*sizeof(void *) + h*w*size, GFP_KERNEL);
-       if (a == NULL) {
+       if (!a) {
                pr_info("%s: alloc memory fail!\n", __func__);
                return NULL;
        }
@@ -134,7 +134,7 @@ void rtw_buf_free(u8 **buf, u32 *buf_len)
 
 void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len)
 {
-       u32 ori_len = 0, dup_len = 0;
+       u32 dup_len = 0;
        u8 *ori = NULL;
        u8 *dup = NULL;
 
@@ -153,7 +153,6 @@ void rtw_buf_update(u8 **buf, u32 *buf_len, u8 *src, u32 src_len)
 
 keep_ori:
        ori = *buf;
-       ori_len = *buf_len;
 
        /* replace buf with dup */
        *buf_len = 0;