Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:41 +0200
committerJiri Slaby <jslaby@suse.cz>2019-07-14 11:33:52 +0200
commita6ed59f05cdab3bd62f1d17d88e4317d9232b9f2 (patch)
treef7429176e88c61de0dec6b91df46e949c82da308
parentf28e049719d9c03e29e12551e9e2c2bf19c5f10a (diff)
staging: mt7621-pci: fix PCIE_FTS_NUM_LO macro (bnc#1012628).
-rw-r--r--patches.kernel.org/5.2.1-038-staging-mt7621-pci-fix-PCIE_FTS_NUM_LO-macro.patch37
-rw-r--r--series.conf1
2 files changed, 38 insertions, 0 deletions
diff --git a/patches.kernel.org/5.2.1-038-staging-mt7621-pci-fix-PCIE_FTS_NUM_LO-macro.patch b/patches.kernel.org/5.2.1-038-staging-mt7621-pci-fix-PCIE_FTS_NUM_LO-macro.patch
new file mode 100644
index 0000000000..efc90da15b
--- /dev/null
+++ b/patches.kernel.org/5.2.1-038-staging-mt7621-pci-fix-PCIE_FTS_NUM_LO-macro.patch
@@ -0,0 +1,37 @@
+From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
+Date: Wed, 26 Jun 2019 14:43:18 +0200
+Subject: [PATCH] staging: mt7621-pci: fix PCIE_FTS_NUM_LO macro
+References: bnc#1012628
+Patch-mainline: 5.2.1
+Git-commit: 0ae0cf509d28d8539b88b5f7f24558f5bfe57cdf
+
+commit 0ae0cf509d28d8539b88b5f7f24558f5bfe57cdf upstream.
+
+Add missing parenthesis to PCIE_FTS_NUM_LO macro to do the
+same it was being done in original code.
+
+Fixes: a4b2eb912bb1 ("staging: mt7621-pci: rewrite RC FTS configuration")
+Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ drivers/staging/mt7621-pci/pci-mt7621.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/staging/mt7621-pci/pci-mt7621.c b/drivers/staging/mt7621-pci/pci-mt7621.c
+index 03d919a94552..93763d40e3a1 100644
+--- a/drivers/staging/mt7621-pci/pci-mt7621.c
++++ b/drivers/staging/mt7621-pci/pci-mt7621.c
+@@ -40,7 +40,7 @@
+ /* MediaTek specific configuration registers */
+ #define PCIE_FTS_NUM 0x70c
+ #define PCIE_FTS_NUM_MASK GENMASK(15, 8)
+-#define PCIE_FTS_NUM_L0(x) ((x) & 0xff << 8)
++#define PCIE_FTS_NUM_L0(x) (((x) & 0xff) << 8)
+
+ /* rt_sysc_membase relative registers */
+ #define RALINK_PCIE_CLK_GEN 0x7c
+--
+2.22.0
+
diff --git a/series.conf b/series.conf
index dc13993e9f..4c4f44712f 100644
--- a/series.conf
+++ b/series.conf
@@ -64,6 +64,7 @@
patches.kernel.org/5.2.1-035-staging-wilc1000-fix-error-path-cleanup-in-wilc.patch
patches.kernel.org/5.2.1-036-staging-bcm2835-camera-Restore-return-behavior-.patch
patches.kernel.org/5.2.1-037-staging-comedi-amplc_pci230-fix-null-pointer-de.patch
+ patches.kernel.org/5.2.1-038-staging-mt7621-pci-fix-PCIE_FTS_NUM_LO-macro.patch
########################################################
# Build fixes that apply to the vanilla kernel too.