]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2015 02:49:57 +0000 (18:49 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Nov 2015 02:49:57 +0000 (18:49 -0800)
added patches:
power-bq24190_charger-suppress-build-warning.patch
sfc-fix-memcpy-with-const-destination-compiler-warning.patch
spi-fix-pointer-integer-size-mismatch-warning.patch

queue-3.14/power-bq24190_charger-suppress-build-warning.patch [new file with mode: 0644]
queue-3.14/series
queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch [new file with mode: 0644]
queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch [new file with mode: 0644]

diff --git a/queue-3.14/power-bq24190_charger-suppress-build-warning.patch b/queue-3.14/power-bq24190_charger-suppress-build-warning.patch
new file mode 100644 (file)
index 0000000..c2d6b17
--- /dev/null
@@ -0,0 +1,56 @@
+From 31f50e48e3e4ea9d503285a389d6a1b5349d66c0 Mon Sep 17 00:00:00 2001
+From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
+Date: Thu, 4 Dec 2014 14:56:04 +0000
+Subject: power: bq24190_charger: suppress build warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
+
+commit 31f50e48e3e4ea9d503285a389d6a1b5349d66c0 upstream.
+
+This patch fixes following build warning:
+
+In file included from include/linux/printk.h:261:0,
+                 from include/linux/kernel.h:13,
+                 from include/linux/list.h:8,
+                 from include/linux/module.h:9,
+                 from drivers/power/bq24190_charger.c:11:
+drivers/power/bq24190_charger.c: In function ‘bq24190_irq_handler_thread’:
+include/linux/dynamic_debug.h:86:20: warning: ‘ss_reg’ may be used uninitialized in this function [-Wmaybe-uninitialized]
+   __dynamic_dev_dbg(&descriptor, dev, fmt, \
+                    ^
+drivers/power/bq24190_charger.c:1211:5: note: ‘ss_reg’ was declared here
+  u8 ss_reg, f_reg;
+     ^
+In file included from include/linux/printk.h:261:0,
+                 from include/linux/kernel.h:13,
+                 from include/linux/list.h:8,
+                 from include/linux/module.h:9,
+                 from drivers/power/bq24190_charger.c:11:
+include/linux/dynamic_debug.h:86:20: warning: ‘f_reg’ may be used uninitialized in this function [-Wmaybe-uninitialized]
+   __dynamic_dev_dbg(&descriptor, dev, fmt, \
+                    ^
+drivers/power/bq24190_charger.c:1211:13: note: ‘f_reg’ was declared here
+  u8 ss_reg, f_reg;
+
+Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com>
+Signed-off-by: Sebastian Reichel <sre@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/power/bq24190_charger.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/power/bq24190_charger.c
++++ b/drivers/power/bq24190_charger.c
+@@ -1208,7 +1208,7 @@ static irqreturn_t bq24190_irq_handler_t
+ {
+       struct bq24190_dev_info *bdi = data;
+       bool alert_userspace = false;
+-      u8 ss_reg, f_reg;
++      u8 ss_reg = 0, f_reg = 0;
+       int ret;
+       pm_runtime_get_sync(bdi->dev);
index 72f0a1f4072afaac38fcb61ed9d637a16f0e9967..b37a3e3f12e6689cc93b6354149ed56530725890 100644 (file)
@@ -12,3 +12,6 @@ drm-nouveau-gem-return-only-valid-domain-when-there-s-only-one.patch
 drm-radeon-dpm-don-t-add-pwm-attributes-if-dpm-is-disabled.patch
 drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch
 drm-radeon-don-t-try-to-recreate-sysfs-entries-on-resume.patch
+sfc-fix-memcpy-with-const-destination-compiler-warning.patch
+power-bq24190_charger-suppress-build-warning.patch
+spi-fix-pointer-integer-size-mismatch-warning.patch
diff --git a/queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch b/queue-3.14/sfc-fix-memcpy-with-const-destination-compiler-warning.patch
new file mode 100644 (file)
index 0000000..c618297
--- /dev/null
@@ -0,0 +1,36 @@
+From 1d20a16062e771b6e26b843c0cde3b17c1146e00 Mon Sep 17 00:00:00 2001
+From: "David S. Miller" <davem@davemloft.net>
+Date: Fri, 17 Apr 2015 15:15:40 -0400
+Subject: sfc: Fix memcpy() with const destination compiler warning.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: "David S. Miller" <davem@davemloft.net>
+
+commit 1d20a16062e771b6e26b843c0cde3b17c1146e00 upstream.
+
+drivers/net/ethernet/sfc/selftest.c: In function ‘efx_iterate_state’:
+drivers/net/ethernet/sfc/selftest.c:388:9: warning: passing argument 1 of ‘memcpy’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-array-qualifiers]
+
+This is because the msg[] member of struct efx_loopback_payload
+is marked as 'const'.  Remove that.
+
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/sfc/selftest.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/sfc/selftest.c
++++ b/drivers/net/ethernet/sfc/selftest.c
+@@ -46,7 +46,7 @@ struct efx_loopback_payload {
+       struct iphdr ip;
+       struct udphdr udp;
+       __be16 iteration;
+-      const char msg[64];
++      char msg[64];
+ } __packed;
+ /* Loopback test source MAC address */
diff --git a/queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch b/queue-3.14/spi-fix-pointer-integer-size-mismatch-warning.patch
new file mode 100644 (file)
index 0000000..9d6a52b
--- /dev/null
@@ -0,0 +1,38 @@
+From e1bde3b11fedace5042f0232339da90bc85666af Mon Sep 17 00:00:00 2001
+From: SeongJae Park <sj38.park@gmail.com>
+Date: Tue, 4 Feb 2014 15:58:09 +0900
+Subject: spi: fix pointer-integer size mismatch warning
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: SeongJae Park <sj38.park@gmail.com>
+
+commit e1bde3b11fedace5042f0232339da90bc85666af upstream.
+
+Fix the pointer-integer size mismatch warning below:
+       drivers/spi/spi-gpio.c: In function ‘spi_gpio_setup’:
+       drivers/spi/spi-gpio.c:252:8: warning: cast from pointer to integer of
+                       different size [-Wpointer-to-int-cast]
+          cs = (unsigned int) spi->controller_data;
+               ^
+
+Signed-off-by: SeongJae Park <sj38.park@gmail.com>
+Signed-off-by: Mark Brown <broonie@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-gpio.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/spi/spi-gpio.c
++++ b/drivers/spi/spi-gpio.c
+@@ -250,7 +250,7 @@ static int spi_gpio_setup(struct spi_dev
+               /*
+                * ... otherwise, take it from spi->controller_data
+                */
+-              cs = (unsigned int) spi->controller_data;
++              cs = (unsigned int)(uintptr_t) spi->controller_data;
+       }
+       if (!spi->controller_state) {