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

[kvmfornfv.git] / kernel / drivers / staging / rtl8712 / usb_intf.c

diff --git a/kernel/drivers/staging/rtl8712/usb_intf.c b/kernel/drivers/staging/rtl8712/usb_intf.c
index f8b5b33..c71333f 100644 (file)
--- a/kernel/drivers/staging/rtl8712/usb_intf.c
+++ b/kernel/drivers/staging/rtl8712/usb_intf.c
@@ -144,6 +144,7 @@ static struct usb_device_id rtl871x_usb_id_tbl[] = {
        {USB_DEVICE(0x0DF6, 0x0058)},
        {USB_DEVICE(0x0DF6, 0x0049)},
        {USB_DEVICE(0x0DF6, 0x004C)},
+       {USB_DEVICE(0x0DF6, 0x006C)},
        {USB_DEVICE(0x0DF6, 0x0064)},
        /* Skyworth */
        {USB_DEVICE(0x14b2, 0x3300)},
@@ -301,7 +302,7 @@ void rtl871x_intf_stop(struct _adapter *padapter)
 
 void r871x_dev_unload(struct _adapter *padapter)
 {
-       if (padapter->bup == true) {
+       if (padapter->bup) {
                /*s1.*/
                padapter->bDriverStopped = true;
 
@@ -330,8 +331,7 @@ static void disable_ht_for_spec_devid(const struct usb_device_id *pdid,
        u16 vid, pid;
        u32 flags;
        int i;
-       int num = sizeof(specific_device_id_tbl) /
-                 sizeof(struct specific_device_id);
+       int num = ARRAY_SIZE(specific_device_id_tbl);
 
        for (i = 0; i < num; i++) {
                vid = specific_device_id_tbl[i].idVendor;
@@ -339,7 +339,7 @@ static void disable_ht_for_spec_devid(const struct usb_device_id *pdid,
                flags = specific_device_id_tbl[i].flags;
 
                if ((pdid->idVendor == vid) && (pdid->idProduct == pid) &&
-                   (flags&SPEC_DEV_ID_DISABLE_HT)) {
+                   (flags & SPEC_DEV_ID_DISABLE_HT)) {
                        padapter->registrypriv.ht_enable = 0;
                        padapter->registrypriv.cbw40_enable = 0;
                        padapter->registrypriv.ampdu_enable = 0;
@@ -395,9 +395,9 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
        /* step 3.
         * initialize the dvobj_priv
         */
-       if (!padapter->dvobj_init)
-                       goto error;
-       else {
+       if (!padapter->dvobj_init) {
+               goto error;
+       } else {
                status = padapter->dvobj_init(padapter);
                if (status != _SUCCESS)
                        goto error;
@@ -426,7 +426,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
                        /* The following operations prevent Efuse leakage by
                         * turning on 2.5V.
                         */
-                       tmpU1b = r8712_read8(padapter, EFUSE_TEST+3);
+                       tmpU1b = r8712_read8(padapter, EFUSE_TEST + 3);
                        r8712_write8(padapter, EFUSE_TEST + 3, tmpU1b | 0x80);
                        msleep(20);
                        r8712_write8(padapter, EFUSE_TEST + 3,
@@ -553,8 +553,9 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
                                padapter->ledpriv.bRegUseLed = false;
                                break;
                        }
-               } else
+               } else {
                        AutoloadFail = false;
+               }
                if (((mac[0] == 0xff) && (mac[1] == 0xff) &&
                     (mac[2] == 0xff) && (mac[3] == 0xff) &&
                     (mac[4] == 0xff) && (mac[5] == 0xff)) ||
@@ -611,7 +612,7 @@ static void r871xu_dev_remove(struct usb_interface *pusb_intf)
                release_firmware(padapter->fw);
                /* never exit with a firmware callback pending */
                wait_for_completion(&padapter->rtl8712_fw_ready);
-               if (drvpriv.drv_registered == true)
+               if (drvpriv.drv_registered)
                        padapter->bSurpriseRemoved = true;
                unregister_netdev(pnetdev); /* will call netdev_close() */
                flush_scheduled_work();