Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8188eu / os_dep / usb_intf.c

diff --git a/drivers/staging/rtl8188eu/os_dep/usb_intf.c b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
index 11d51a30170ffbd1a4d12b7ed7465461e3106555..cf33f65df8ff5b1c34f0763ee5fc50c2c1294f22 100644 (file)
--- a/drivers/staging/rtl8188eu/os_dep/usb_intf.c
+++ b/drivers/staging/rtl8188eu/os_dep/usb_intf.c
@@ -79,9 +79,8 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
 
        pdvobjpriv->NumInterfaces = pconf_desc->bNumInterfaces;
        pdvobjpriv->InterfaceNumber = piface_desc->bInterfaceNumber;
-       pdvobjpriv->nr_endpoint = piface_desc->bNumEndpoints;
 
-       for (i = 0; i < pdvobjpriv->nr_endpoint; i++) {
+       for (i = 0; i < piface_desc->bNumEndpoints; i++) {
                int ep_num;
                pendp_desc = &phost_iface->endpoint[i].desc;
 
@@ -98,7 +97,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
                                ep_num;
                        pdvobjpriv->RtNumOutPipes++;
                }
-               pdvobjpriv->ep_num[i] = ep_num;
        }
 
        if (pusbd->speed == USB_SPEED_HIGH)
@@ -107,13 +105,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
                pdvobjpriv->ishighspeed = false;
 
        mutex_init(&pdvobjpriv->usb_vendor_req_mutex);
-       pdvobjpriv->usb_vendor_req_buf = kzalloc(MAX_USB_IO_CTL_SIZE, GFP_KERNEL);
-
-       if (!pdvobjpriv->usb_vendor_req_buf) {
-               usb_set_intfdata(usb_intf, NULL);
-               kfree(pdvobjpriv);
-               return NULL;
-       }
        usb_get_dev(pusbd);
 
        return pdvobjpriv;
@@ -141,7 +132,6 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
                        }
                }
 
-               kfree(dvobj->usb_vendor_req_buf);
                mutex_destroy(&dvobj->usb_vendor_req_mutex);
                kfree(dvobj);
        }
@@ -238,7 +228,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
        rtw_cancel_all_timer(padapter);
        LeaveAllPowerSaveMode(padapter);
 
-       _enter_pwrlock(&pwrpriv->lock);
+       mutex_lock(&pwrpriv->mutex_lock);
        /* s1. */
        if (pnetdev) {
                netif_carrier_off(pnetdev);
@@ -267,7 +257,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
        rtw_free_network_queue(padapter, true);
 
        rtw_dev_unload(padapter);
-       _exit_pwrlock(&pwrpriv->lock);
+       mutex_unlock(&pwrpriv->mutex_lock);
 
        if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
                rtw_indicate_scan_done(padapter, 1);
@@ -298,7 +288,7 @@ static int rtw_resume_process(struct adapter *padapter)
                goto exit;
        }
 
-       _enter_pwrlock(&pwrpriv->lock);
+       mutex_lock(&pwrpriv->mutex_lock);
        rtw_reset_drv_sw(padapter);
        pwrpriv->bkeepfwalive = false;
 
@@ -309,14 +299,16 @@ static int rtw_resume_process(struct adapter *padapter)
        netif_device_attach(pnetdev);
        netif_carrier_on(pnetdev);
 
-       _exit_pwrlock(&pwrpriv->lock);
+       mutex_unlock(&pwrpriv->mutex_lock);
 
        rtw_roaming(padapter, NULL);
 
        ret = 0;
 exit:
-       if (pwrpriv)
+       if (pwrpriv) {
                pwrpriv->bInSuspend = false;
+               mutex_unlock(&pwrpriv->mutex_lock);
+       }
        pr_debug("<===  %s return %d.............. in %dms\n", __func__,
                ret, jiffies_to_msecs(jiffies - start_time));
 
@@ -370,7 +362,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
        }
 
        /* step 2. hook HalFunc, allocate HalData */
-       hal_set_hal_ops(padapter);
+       rtl8188eu_set_hal_ops(padapter);
 
        padapter->intf_start = &usb_intf_start;
        padapter->intf_stop = &usb_intf_stop;
@@ -456,11 +448,9 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
        free_mlme_ap_info(if1);
 #endif
 
-       if (pnetdev) {
-               /* will call netdev_close() */
-               unregister_netdev(pnetdev);
-               rtw_proc_remove_one(pnetdev);
-       }
+       if (pnetdev)
+               unregister_netdev(pnetdev); /* will call netdev_close() */
+
        rtl88eu_mon_deinit(if1->pmondev);
        rtw_cancel_all_timer(if1);