From 3200b15ad000572593c94c4ea5ca34600ae79a56 Mon Sep 17 00:00:00 2001 From: gwl Date: Thu, 20 Mar 2014 13:29:16 +0800 Subject: [PATCH] Wifi:bcmdhd: fix some module firmware patch error. --- .../rockchip_wlan/rkwifi/bcmdhd/dhd_config.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c index c1ad3dacc403..47dc3f8d9c61 100644 --- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c +++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/dhd_config.c @@ -146,31 +146,31 @@ dhd_conf_set_fw_name_by_chip(dhd_pub_t *dhd, char *dst, char *src) else strcpy(&dst[i+1], bcm43362a2_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; } - } else { - switch (chip) { - case BCM4330_CHIP_ID: - strcpy(&dst[i+1], bcm4330b2ag_fw_name[fw_type]); - break; - } - } - + } 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); } -- 2.34.1