Home Home > GIT Browse > SLE15-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-08-18 09:31:56 +0200
committerTakashi Iwai <tiwai@suse.de>2019-08-18 09:32:20 +0200
commitad7168f4aa6804123e321c0c214978c1ab80f7f7 (patch)
tree321d4e741140a33065d62c5f74487bc5f9c998fe
parentef1229a2217a973c1f760ab2050913c03c4c2e56 (diff)
iio: adc: max9611: Fix misuse of GENMASK macro (bsc#1051510).
-rw-r--r--patches.drivers/iio-adc-max9611-Fix-misuse-of-GENMASK-macro.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.drivers/iio-adc-max9611-Fix-misuse-of-GENMASK-macro.patch b/patches.drivers/iio-adc-max9611-Fix-misuse-of-GENMASK-macro.patch
new file mode 100644
index 0000000000..15d62d6c9c
--- /dev/null
+++ b/patches.drivers/iio-adc-max9611-Fix-misuse-of-GENMASK-macro.patch
@@ -0,0 +1,36 @@
+From ae8cc91a7d85e018c0c267f580820b2bb558cd48 Mon Sep 17 00:00:00 2001
+From: Joe Perches <joe@perches.com>
+Date: Tue, 9 Jul 2019 22:04:17 -0700
+Subject: [PATCH] iio: adc: max9611: Fix misuse of GENMASK macro
+Git-commit: ae8cc91a7d85e018c0c267f580820b2bb558cd48
+Patch-mainline: v5.3-rc4
+References: bsc#1051510
+
+Arguments are supposed to be ordered high then low.
+
+Signed-off-by: Joe Perches <joe@perches.com>
+Fixes: 69780a3bbc0b ("iio: adc: Add Maxim max9611 ADC driver")
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/iio/adc/max9611.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/iio/adc/max9611.c b/drivers/iio/adc/max9611.c
+index 917223d5ff5b..0e3c6529fc4c 100644
+--- a/drivers/iio/adc/max9611.c
++++ b/drivers/iio/adc/max9611.c
+@@ -83,7 +83,7 @@
+ #define MAX9611_TEMP_MAX_POS 0x7f80
+ #define MAX9611_TEMP_MAX_NEG 0xff80
+ #define MAX9611_TEMP_MIN_NEG 0xd980
+-#define MAX9611_TEMP_MASK GENMASK(7, 15)
++#define MAX9611_TEMP_MASK GENMASK(15, 7)
+ #define MAX9611_TEMP_SHIFT 0x07
+ #define MAX9611_TEMP_RAW(_r) ((_r) >> MAX9611_TEMP_SHIFT)
+ #define MAX9611_TEMP_SCALE_NUM 1000000
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index f0c62fed93..e89d4a138b 100644
--- a/series.conf
+++ b/series.conf
@@ -23395,6 +23395,7 @@
patches.drivers/usb-yurex-Fix-use-after-free-in-yurex_delete.patch
patches.drivers/usb-usbfs-fix-double-free-of-usb-memory-upon-submitu.patch
patches.drivers/usb-iowarrior-fix-deadlock-on-disconnect.patch
+ patches.drivers/iio-adc-max9611-Fix-misuse-of-GENMASK-macro.patch
patches.fixes/driver_core-Fix_use-after-free_and_double_free_on_glue.patch
patches.drivers/ALSA-hda-Apply-workaround-for-another-AMD-chip-1022-.patch
patches.drivers/ALSA-hda-Fix-a-memory-leak-bug.patch