diff mbox

[v2] rt2800: enable rt3290 unconditionally on pci probe

Message ID 1485774767-6655-1-git-send-email-sgruszka@redhat.com (mailing list archive)
State Accepted
Commit 6715208d0a95ae417203f8e4a7937c1b4c4947f2
Delegated to: Kalle Valo
Headers show

Commit Message

Stanislaw Gruszka Jan. 30, 2017, 11:12 a.m. UTC 
When we restart system using sysrq RT3290 device do not initalize
properly, hance always enable it via WLAN_FUN_CTRL register on
probe.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=85461
Reported-and-tested-by: Giedrius Statkevičius <edrius.statkevicius@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Kalle Valo Jan. 31, 2017, 7:28 a.m. UTC | #1 
Stanislaw Gruszka <sgruszka@redhat.com> wrote:
> When we restart system using sysrq RT3290 device do not initalize
> properly, hance always enable it via WLAN_FUN_CTRL register on
> probe.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=85461
> Reported-and-tested-by: Giedrius Statkevičius <edrius.statkevicius@gmail.com>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>

Patch applied to wireless-drivers-next.git, thanks.

6715208d0a95 rt2800: enable rt3290 unconditionally on pci probe
diff mbox

Patch

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 560b696..c6e64cc 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -373,9 +373,6 @@  static int rt2800_enable_wlan_rt3290(struct rt2x00_dev *rt2x00dev)
 	int i, count;
 
 	rt2800_register_read(rt2x00dev, WLAN_FUN_CTRL, &reg);
-	if (rt2x00_get_field32(reg, WLAN_EN))
-		return 0;
-
 	rt2x00_set_field32(&reg, WLAN_GPIO_OUT_OE_BIT_ALL, 0xff);
 	rt2x00_set_field32(&reg, FRC_WL_ANT_SET, 1);
 	rt2x00_set_field32(&reg, WLAN_CLK_EN, 0);