diff --git a/kernel.spec b/kernel.spec index 8837a13..0bc2d01 100644 --- a/kernel.spec +++ b/kernel.spec @@ -214,6 +214,9 @@ Patch114: 0004-Turn-into-BFQ-v8r7-for-4.9.0.patch # http://bugs.rosalinux.ru/show_bug.cgi?id=7533 Patch200: i915_hack_bug_97822.patch +# Patches from mainline. +Patch300: rt2800-enable-rt3290-unconditionally-on-pci-probe.patch + # Sanitizing kernel memory # We do not use "Patch:" here because apply_patches would always apply it # then, it seems, even if we place "Patch: <..>" under a conditional. diff --git a/rt2800-enable-rt3290-unconditionally-on-pci-probe.patch b/rt2800-enable-rt3290-unconditionally-on-pci-probe.patch new file mode 100644 index 0000000..683e8d5 --- /dev/null +++ b/rt2800-enable-rt3290-unconditionally-on-pci-probe.patch @@ -0,0 +1,37 @@ +From 6715208d0a95ae417203f8e4a7937c1b4c4947f2 Mon Sep 17 00:00:00 2001 +From: Stanislaw Gruszka +Date: Mon, 30 Jan 2017 12:12:47 +0100 +Subject: [PATCH] rt2800: enable rt3290 unconditionally on pci probe +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +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 +Signed-off-by: Stanislaw Gruszka +Signed-off-by: Kalle Valo +--- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +index 755c093..572cdea 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, ®); +- if (rt2x00_get_field32(reg, WLAN_EN)) +- return 0; +- + rt2x00_set_field32(®, WLAN_GPIO_OUT_OE_BIT_ALL, 0xff); + rt2x00_set_field32(®, FRC_WL_ANT_SET, 1); + rt2x00_set_field32(®, WLAN_CLK_EN, 0); +-- +2.7.3 +