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

[deliverable/linux.git] / drivers / staging / rtl8712 / usb_intf.c

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index c1a0ca49054663abcbae1a96be244729920dc8ba..3fc65b2c0178b536c15e25e60ec4f02e021a42c8 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -301,7 +301,8 @@ void rtl871x_intf_stop(struct _adapter *padapter)
        /*disable_hw_interrupt*/
        if (!padapter->bSurpriseRemoved) {
                /*device still exists, so driver can do i/o operation
-                * TODO: */
+                * TODO:
+                */
        }
 
        /* cancel in irp */
@@ -611,7 +612,8 @@ error:
 }
 
 /* rmmod module & unplug(SurpriseRemoved) will call r871xu_dev_remove()
- * => how to recognize both */
+ * => how to recognize both
+ */
 static void r871xu_dev_remove(struct usb_interface *pusb_intf)
 {
        struct net_device *pnetdev = usb_get_intfdata(pusb_intf);
@@ -635,12 +637,14 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
                r8712_free_drv_sw(padapter);
 
                /* decrease the reference count of the usb device structure
-                * when disconnect */
+                * when disconnect
+                */
                usb_put_dev(udev);
        }
        /* If we didn't unplug usb dongle and remove/insert module, driver
         * fails on sitesurvey for the first time when device is up.
-        * Reset usb port for sitesurvey fail issue. */
+        * Reset usb port for sitesurvey fail issue.
+        */
        if (udev->state != USB_STATE_NOTATTACHED)
                usb_reset_device(udev);
 }