From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 3 May 2016 00:03:32 +0000 (-0700)
Subject: 4.4-stable patches
X-Git-Tag: v3.14.68~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1733d4d458a47c85be1c3bc1737ff746c5c60ea9;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	extcon-max77843-use-correct-size-for-reading-the-interrupt-register.patch
	stm-class-select-config_srcu.patch
---

diff --git a/queue-4.4/extcon-max77843-use-correct-size-for-reading-the-interrupt-register.patch b/queue-4.4/extcon-max77843-use-correct-size-for-reading-the-interrupt-register.patch
new file mode 100644
index 00000000000..bfaee291c1e
--- /dev/null
+++ b/queue-4.4/extcon-max77843-use-correct-size-for-reading-the-interrupt-register.patch
@@ -0,0 +1,36 @@
+From c4924e92442d7218bd725e47fa3988c73aae84c9 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Thu, 4 Feb 2016 14:36:09 +0300
+Subject: extcon: max77843: Use correct size for reading the interrupt register
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit c4924e92442d7218bd725e47fa3988c73aae84c9 upstream.
+
+The info->status[] array has 3 elements.  We are using size
+MAX77843_MUIC_IRQ_NUM (16) instead of MAX77843_MUIC_STATUS_NUM (3) as
+intended.
+
+Fixes: 135d9f7d135a ('extcon: max77843: Clear IRQ bits state before request IRQ')
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Reviewed-by: Jaewon Kim <jaewon02.kim@samsung.com>
+Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
+[cw00.choi: Modify the patch title]
+Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/extcon/extcon-max77843.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/extcon/extcon-max77843.c
++++ b/drivers/extcon/extcon-max77843.c
+@@ -803,7 +803,7 @@ static int max77843_muic_probe(struct pl
+ 	/* Clear IRQ bits before request IRQs */
+ 	ret = regmap_bulk_read(max77843->regmap_muic,
+ 			MAX77843_MUIC_REG_INT1, info->status,
+-			MAX77843_MUIC_IRQ_NUM);
++			MAX77843_MUIC_STATUS_NUM);
+ 	if (ret) {
+ 		dev_err(&pdev->dev, "Failed to Clear IRQ bits\n");
+ 		goto err_muic_irq;
diff --git a/queue-4.4/series b/queue-4.4/series
index 7fc08332da9..aa0169fc4ac 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -159,3 +159,5 @@ unbreak-allmodconfig-kconfig_allconfig.patch
 thermal-rockchip-fix-a-impossible-condition-caused-by-the-warning.patch
 sunrpc-cache-drop-reference-when-sunrpc_cache_pipe_upcall-detects-a-race.patch
 megaraid_sas-add-missing-curly-braces-in-ioctl-handler.patch
+stm-class-select-config_srcu.patch
+extcon-max77843-use-correct-size-for-reading-the-interrupt-register.patch
diff --git a/queue-4.4/stm-class-select-config_srcu.patch b/queue-4.4/stm-class-select-config_srcu.patch
new file mode 100644
index 00000000000..c9b5ea9bec6
--- /dev/null
+++ b/queue-4.4/stm-class-select-config_srcu.patch
@@ -0,0 +1,41 @@
+From 042d4460b5b4379a12f375045ff9065cf6758735 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Tue, 22 Dec 2015 17:25:17 +0200
+Subject: stm class: Select CONFIG_SRCU
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 042d4460b5b4379a12f375045ff9065cf6758735 upstream.
+
+The newly added STM code uses SRCU, but does not ensure that
+this code is part of the kernel:
+
+drivers/built-in.o: In function `stm_source_link_show':
+include/linux/srcu.h:221: undefined reference to `__srcu_read_lock'
+include/linux/srcu.h:238: undefined reference to `__srcu_read_unlock'
+drivers/built-in.o: In function `stm_source_link_drop':
+include/linux/srcu.h:221: undefined reference to `__srcu_read_lock'
+include/linux/srcu.h:238: undefined reference to `__srcu_read_unlock'
+
+This adds a Kconfig 'select' statement like all the other SRCU using
+drivers have.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Fixes: 7bd1d4093c2f ("stm class: Introduce an abstraction for System Trace Module devices")
+Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hwtracing/stm/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/hwtracing/stm/Kconfig
++++ b/drivers/hwtracing/stm/Kconfig
+@@ -1,6 +1,7 @@
+ config STM
+ 	tristate "System Trace Module devices"
+ 	select CONFIGFS_FS
++	select SRCU
+ 	help
+ 	  A System Trace Module (STM) is a device exporting data in System
+ 	  Trace Protocol (STP) format as defined by MIPI STP standards.