From 42641698c86ed14e006108772ff36aa07379bbc6 Mon Sep 17 00:00:00 2001 From: Shahar Levi Date: Sun, 6 Mar 2011 16:32:06 +0200 Subject: [PATCH] --- yaml --- r: 247087 b: refs/heads/master c: b9b0fdead0e8d964a534e5b09f40d8bd4bf7dfe8 h: refs/heads/master i: 247085: 38891fe66286eca16369fd0043a27027c2e8cc40 247083: af5bd69660e648bd675754ce37046eb1b63523d4 247079: 0b464cedc4070131cc02ae5bc7c388d35d21a541 247071: 4c90494a6c53395b6452c4cdec829496c2661899 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/boot.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 9131382f93c5..01af1db612cb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62c7d085e1f2a1f2b4d89560551eff18d703b3b1 +refs/heads/master: b9b0fdead0e8d964a534e5b09f40d8bd4bf7dfe8 diff --git a/trunk/drivers/net/wireless/wl12xx/boot.c b/trunk/drivers/net/wireless/wl12xx/boot.c index 6934dffd5174..69fe8703be42 100644 --- a/trunk/drivers/net/wireless/wl12xx/boot.c +++ b/trunk/drivers/net/wireless/wl12xx/boot.c @@ -585,13 +585,6 @@ int wl1271_load_firmware(struct wl1271 *wl) /* 6. read the EEPROM parameters */ tmp = wl1271_read32(wl, SCR_PAD2); - ret = wl1271_boot_write_irq_polarity(wl); - if (ret < 0) - goto out; - - wl1271_write32(wl, ACX_REG_INTERRUPT_MASK, - WL1271_ACX_ALL_EVENTS_VECTOR); - /* WL1271: The reference driver skips steps 7 to 10 (jumps directly * to upload_fw) */ @@ -618,6 +611,13 @@ int wl1271_boot(struct wl1271 *wl) if (ret < 0) goto out; + ret = wl1271_boot_write_irq_polarity(wl); + if (ret < 0) + goto out; + + wl1271_write32(wl, ACX_REG_INTERRUPT_MASK, + WL1271_ACX_ALL_EVENTS_VECTOR); + /* Enable firmware interrupts now */ wl1271_boot_enable_interrupts(wl);