summaryrefslogtreecommitdiff
path: root/drivers/staging/rtl8188eu/os_dep/usb_intf.c
diff options
context:
space:
mode:
authornavin patidar <navin.patidar@gmail.com>2014-06-06 21:45:11 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-19 15:32:10 -0700
commit418f96424f7093acdb1b1c105dddc9268ea270f8 (patch)
tree4bfd52576c657384ffd33b0d24fac4f82f6289c4 /drivers/staging/rtl8188eu/os_dep/usb_intf.c
parentf0e7a514e189071b47b968cee68d0c97c8960e05 (diff)
staging: rtl8188eu: Remove rtw_init_intf_priv()
Signed-off-by: navin patidar <navin.patidar@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8188eu/os_dep/usb_intf.c')
-rw-r--r--drivers/staging/rtl8188eu/os_dep/usb_intf.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index f874270e0b10..a84ee9796ce6 100644
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -52,16 +52,6 @@ static struct usb_device_id rtw_usb_id_tbl[] = {
MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl);
-static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
-{
- 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;
-
- return _SUCCESS;
-}
-
static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
{
int i;
@@ -125,7 +115,10 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
else
pdvobjpriv->ishighspeed = false;
- if (rtw_init_intf_priv(pdvobjpriv) == _FAIL)
+ mutex_init(&pdvobjpriv->usb_vendor_req_mutex);
+ pdvobjpriv->usb_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
+
+ if (!pdvobjpriv->usb_vendor_req_buf)
goto free_dvobj;
rtw_reset_continual_urb_error(pdvobjpriv);