Wifi:bcmdhd: fix some module firmware patch error.
authorgwl <gwl@rock-chips.com>
Thu, 20 Mar 2014 05:29:16 +0000 (13:29 +0800)
committergwl <gwl@rock-chips.com>
Thu, 20 Mar 2014 05:29:39 +0000 (13:29 +0800)
drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c

index c1ad3dacc40317e904e2ee7234d1e5f2e14e6332..47dc3f8d9c61c5f9a6a15bb862686b971172ff96 100644 (file)
@@ -146,31 +146,31 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *dst, char *src)
                 else\r
                     strcpy(&dst[i+1], bcm43362a2_fw_name[fw_type]);\r
                 break;\r
-            case BCM43341_CHIP_ID:\r
-                if (chiprev == BCM43341B0_CHIP_REV)\r
-                    strcpy(&dst[i+1], bcm43341b0ag_fw_name[fw_type]);\r
-                break;\r
-            case BCM4324_CHIP_ID:\r
-                if (chiprev == BCM43241B4_CHIP_REV)\r
-                    strcpy(&dst[i+1], bcm43241b4ag_fw_name[fw_type]);\r
-                break;\r
-            case BCM4335_CHIP_ID:\r
-                if (chiprev == BCM4335A0_CHIP_REV)\r
-                    strcpy(&dst[i+1], bcm4339a0ag_fw_name[fw_type]);\r
-                break;\r
-            case BCM4339_CHIP_ID:\r
-                if (chiprev == BCM4339A0_CHIP_REV)\r
-                    strcpy(&dst[i+1], bcm4339a0ag_fw_name[fw_type]);\r
-                break;\r
         }\r
-    } else {\r
-        switch (chip) {\r
-            case BCM4330_CHIP_ID:\r
-                    strcpy(&dst[i+1], bcm4330b2ag_fw_name[fw_type]);\r
-                break;\r
-        }\r
-    }\r
-\r
+    } else {
+        switch (chip) {
+            case BCM4330_CHIP_ID:
+                    strcpy(&dst[i+1], bcm4330b2ag_fw_name[fw_type]);
+                break;
+            case BCM43341_CHIP_ID:
+                if (chiprev == BCM43341B0_CHIP_REV)
+                    strcpy(&dst[i+1], bcm43341b0ag_fw_name[fw_type]);
+                break;
+            case BCM4324_CHIP_ID:
+                if (chiprev == BCM43241B4_CHIP_REV)
+                    strcpy(&dst[i+1], bcm43241b4ag_fw_name[fw_type]);
+                break;
+            case BCM4335_CHIP_ID:
+                if (chiprev == BCM4335A0_CHIP_REV)
+                    strcpy(&dst[i+1], bcm4339a0ag_fw_name[fw_type]);
+                break;
+            case BCM4339_CHIP_ID:
+                if (chiprev == BCM4339A0_CHIP_REV)
+                    strcpy(&dst[i+1], bcm4339a0ag_fw_name[fw_type]);
+                break;
+        }
+    }
+
     printk("%s: firmware_path=%s\n", __FUNCTION__, dst);\r
 }\r
 \r