aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch
diff options
context:
space:
mode:
authorYangbo Lu <yangbo.lu@nxp.com>2020-04-10 10:47:05 +0800
committerPetr Štetiar <ynezz@true.cz>2020-05-07 12:53:06 +0200
commitcddd4591404fb4c53dc0b3c0b15b942cdbed4356 (patch)
tree392c1179de46b0f804e3789edca19069b64e6b44 /target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch
parentd1d2c0b5579ea4f69a42246c9318539d61ba1999 (diff)
downloadupstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.gz
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.tar.bz2
upstream-cddd4591404fb4c53dc0b3c0b15b942cdbed4356.zip
layerscape: add patches-5.4
Add patches for linux-5.4. The patches are from NXP LSDK-20.04 release which was tagged LSDK-20.04-V5.4. https://source.codeaurora.org/external/qoriq/qoriq-components/linux/ For boards LS1021A-IOT, and Traverse-LS1043 which are not involved in LSDK, port the dts patches from 4.14. The patches are sorted into the following categories: 301-arch-xxxx 302-dts-xxxx 303-core-xxxx 701-net-xxxx 801-audio-xxxx 802-can-xxxx 803-clock-xxxx 804-crypto-xxxx 805-display-xxxx 806-dma-xxxx 807-gpio-xxxx 808-i2c-xxxx 809-jailhouse-xxxx 810-keys-xxxx 811-kvm-xxxx 812-pcie-xxxx 813-pm-xxxx 814-qe-xxxx 815-sata-xxxx 816-sdhc-xxxx 817-spi-xxxx 818-thermal-xxxx 819-uart-xxxx 820-usb-xxxx 821-vfio-xxxx Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch b/target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch
new file mode 100644
index 0000000000..97f4cb0350
--- /dev/null
+++ b/target/linux/layerscape/patches-5.4/801-audio-0058-MLK-20189-8-ASoC-fsl_sai-use-signed-offset-variable.patch
@@ -0,0 +1,53 @@
+From d8802def525b4f74f66fca02afe9c17a729a3201 Mon Sep 17 00:00:00 2001
+From: Viorel Suman <viorel.suman@nxp.com>
+Date: Tue, 13 Nov 2018 11:36:29 +0200
+Subject: [PATCH] MLK-20189-8: ASoC: fsl_sai: use signed offset variable
+
+Both dataline_off and dataline_off_dsd fields are unsigned,
+thus checking negative values make no sense. Use a signed
+variable to calculate offset instead.
+
+This fixes Coverity issue: CID1899299
+
+Signed-off-by: Viorel Suman <viorel.suman@nxp.com>
+---
+ sound/soc/fsl/fsl_sai.c | 14 +++++---------
+ 1 file changed, 5 insertions(+), 9 deletions(-)
+
+--- a/sound/soc/fsl/fsl_sai.c
++++ b/sound/soc/fsl/fsl_sai.c
+@@ -1273,7 +1273,7 @@ static int fsl_sai_probe(struct platform
+ char tmp[8];
+ int irq, ret, i;
+ int index;
+- int firstbitidx, nextbitidx;
++ int firstbitidx, nextbitidx, offset;
+ struct regmap_config fsl_sai_regmap_config = fsl_sai_v2_regmap_config;
+ unsigned long irqflags = 0;
+
+@@ -1356,10 +1356,8 @@ static int fsl_sai_probe(struct platform
+ for (i = 0; i < 2; i++) {
+ firstbitidx = find_first_bit((const unsigned long *)&sai->dataline[i], 8);
+ nextbitidx = find_next_bit((const unsigned long *)&sai->dataline[i], 8, firstbitidx+1);
+- sai->dataline_off[i] = nextbitidx - firstbitidx - 1;
+-
+- if (sai->dataline_off[i] < 0 || sai->dataline_off[i] >= 7)
+- sai->dataline_off[i] = 0;
++ offset = nextbitidx - firstbitidx - 1;
++ sai->dataline_off[i] = (offset < 0 || offset >= 7 ? 0 : offset);
+ }
+
+ ret = of_property_read_u32_index(np, "fsl,dataline,dsd", 0, &sai->dataline_dsd[0]);
+@@ -1378,10 +1376,8 @@ static int fsl_sai_probe(struct platform
+ for (i = 0; i < 2; i++) {
+ firstbitidx = find_first_bit((const unsigned long *)&sai->dataline_dsd[i], 8);
+ nextbitidx = find_next_bit((const unsigned long *)&sai->dataline_dsd[i], 8, firstbitidx+1);
+- sai->dataline_off_dsd[i] = nextbitidx - firstbitidx - 1;
+-
+- if (sai->dataline_off_dsd[i] < 0 || sai->dataline_off_dsd[i] >= 7)
+- sai->dataline_off_dsd[i] = 0;
++ offset = nextbitidx - firstbitidx - 1;
++ sai->dataline_off_dsd[i] = (offset < 0 || offset >= 7 ? 0 : offset);
+ }
+
+ if ((of_find_property(np, "fsl,i2s-xtor", NULL) != NULL) ||