staging: rtl8188eu: Remove usb_alloc_vendor_req_buf from struct dvobj_priv

Signed-off-by: navin patidar <navin.patidar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/include/drv_types.h b/drivers/staging/rtl8188eu/include/drv_types.h
index c441d46a77e256b083d0505eee3164299794ef72..7586de71dcdcc5982f4f5154b29e2c1bd0866210 100644 (file)
--- a/drivers/staging/rtl8188eu/include/drv_types.h
+++ b/drivers/staging/rtl8188eu/include/drv_types.h
@@ -172,7 +172,6 @@ struct dvobj_priv {
        int     ep_num[5]; /* endpoint number */
        struct mutex  usb_vendor_req_mutex;
 
-       u8 *usb_alloc_vendor_req_buf;
        u8 *usb_vendor_req_buf;
 
        struct usb_interface *pusbintf;

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 2333fa648357dc70985180031d2ef192b3285360..1265a47da26625384c8506b75e8d82184da1d70c 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -54,26 +54,19 @@ MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl);
 
 static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
 {
-       u8 rst = _SUCCESS;
-
        mutex_init(&dvobj->usb_vendor_req_mutex);
+       dvobj->usb_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
+       if (!dvobj->usb_vendor_req_buf)
+               return _FAIL;
 
-       dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
-       if (dvobj->usb_alloc_vendor_req_buf == NULL) {
-               DBG_88E("alloc usb_vendor_req_buf failed...\n");
-               rst = _FAIL;
-               goto exit;
-       }
-       dvobj->usb_vendor_req_buf = (u8 *)N_BYTE_ALIGMENT((size_t)(dvobj->usb_alloc_vendor_req_buf), ALIGNMENT_UNIT);
-exit:
-       return rst;
+       return _SUCCESS;
 }
 
 static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj)
 {
        u8 rst = _SUCCESS;
 
-       kfree(dvobj->usb_alloc_vendor_req_buf);
+       kfree(dvobj->usb_vendor_req_buf);
        mutex_destroy(&dvobj->usb_vendor_req_mutex);
        return rst;
 }