diff options
Diffstat (limited to 'drivers/net/wireless/ti/wl12xx')
-rw-r--r-- | drivers/net/wireless/ti/wl12xx/main.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c index 6b187d066c51..00ecd2ad495a 100644 --- a/drivers/net/wireless/ti/wl12xx/main.c +++ b/drivers/net/wireless/ti/wl12xx/main.c | |||
@@ -272,9 +272,10 @@ static int wl12xx_identify_chip(struct wl1271 *wl) | |||
272 | wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete", | 272 | wl1271_warning("chip id 0x%x (1271 PG10) support is obsolete", |
273 | wl->chip.id); | 273 | wl->chip.id); |
274 | 274 | ||
275 | wl->quirks |= WLCORE_QUIRK_NO_BLOCKSIZE_ALIGNMENT | | 275 | /* clear the alignment quirk, since we don't support it */ |
276 | WLCORE_QUIRK_LEGACY_NVS; | 276 | wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN; |
277 | wl->plt_fw_name = WL127X_PLT_FW_NAME; | 277 | |
278 | wl->quirks |= WLCORE_QUIRK_LEGACY_NVS; | ||
278 | wl->sr_fw_name = WL127X_FW_NAME_SINGLE; | 279 | wl->sr_fw_name = WL127X_FW_NAME_SINGLE; |
279 | wl->mr_fw_name = WL127X_FW_NAME_MULTI; | 280 | wl->mr_fw_name = WL127X_FW_NAME_MULTI; |
280 | 281 | ||
@@ -287,8 +288,10 @@ static int wl12xx_identify_chip(struct wl1271 *wl) | |||
287 | wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)", | 288 | wl1271_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)", |
288 | wl->chip.id); | 289 | wl->chip.id); |
289 | 290 | ||
290 | wl->quirks |= WLCORE_QUIRK_NO_BLOCKSIZE_ALIGNMENT | | 291 | /* clear the alignment quirk, since we don't support it */ |
291 | WLCORE_QUIRK_LEGACY_NVS; | 292 | wl->quirks &= ~WLCORE_QUIRK_TX_BLOCKSIZE_ALIGN; |
293 | |||
294 | wl->quirks |= WLCORE_QUIRK_LEGACY_NVS; | ||
292 | wl->plt_fw_name = WL127X_PLT_FW_NAME; | 295 | wl->plt_fw_name = WL127X_PLT_FW_NAME; |
293 | wl->sr_fw_name = WL127X_FW_NAME_SINGLE; | 296 | wl->sr_fw_name = WL127X_FW_NAME_SINGLE; |
294 | wl->mr_fw_name = WL127X_FW_NAME_MULTI; | 297 | wl->mr_fw_name = WL127X_FW_NAME_MULTI; |