]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Sep 2016 11:36:39 +0000 (13:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 9 Sep 2016 11:36:39 +0000 (13:36 +0200)
added patches:
alsa-oxygen-fix-logical-not-parentheses-warning.patch
be2iscsi-fix-bogus-warn_on-length-check.patch
hid-hid-input-add-parentheses-to-quell-gcc-warning.patch
stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch

queue-3.14/alsa-oxygen-fix-logical-not-parentheses-warning.patch [new file with mode: 0644]
queue-3.14/be2iscsi-fix-bogus-warn_on-length-check.patch [new file with mode: 0644]
queue-3.14/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch [new file with mode: 0644]
queue-3.14/series
queue-3.14/stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch [new file with mode: 0644]

diff --git a/queue-3.14/alsa-oxygen-fix-logical-not-parentheses-warning.patch b/queue-3.14/alsa-oxygen-fix-logical-not-parentheses-warning.patch
new file mode 100644 (file)
index 0000000..c032a72
--- /dev/null
@@ -0,0 +1,32 @@
+From 8ec7cfce3762299ae289c384e281b2f4010ae231 Mon Sep 17 00:00:00 2001
+From: Tomer Barletz <barletz@gmail.com>
+Date: Sun, 2 Aug 2015 02:08:57 -0700
+Subject: ALSA: oxygen: Fix logical-not-parentheses warning
+
+From: Tomer Barletz <barletz@gmail.com>
+
+commit 8ec7cfce3762299ae289c384e281b2f4010ae231 upstream.
+
+This fixes the following warning, that is seen with gcc 5.1:
+warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses].
+
+Signed-off-by: Tomer Barletz <barletz@gmail.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Cc: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/oxygen/oxygen_mixer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/oxygen/oxygen_mixer.c
++++ b/sound/pci/oxygen/oxygen_mixer.c
+@@ -88,7 +88,7 @@ static int dac_mute_put(struct snd_kcont
+       int changed;
+       mutex_lock(&chip->mutex);
+-      changed = !value->value.integer.value[0] != chip->dac_mute;
++      changed = (!value->value.integer.value[0]) != chip->dac_mute;
+       if (changed) {
+               chip->dac_mute = !value->value.integer.value[0];
+               chip->model.update_dac_mute(chip);
diff --git a/queue-3.14/be2iscsi-fix-bogus-warn_on-length-check.patch b/queue-3.14/be2iscsi-fix-bogus-warn_on-length-check.patch
new file mode 100644 (file)
index 0000000..4a80bcd
--- /dev/null
@@ -0,0 +1,41 @@
+From dd29dae00d39186890a5eaa2fe4ad8768bfd41a9 Mon Sep 17 00:00:00 2001
+From: Tim Gardner <tim.gardner@canonical.com>
+Date: Fri, 30 Oct 2015 12:22:58 -0600
+Subject: be2iscsi: Fix bogus WARN_ON length check
+
+From: Tim Gardner <tim.gardner@canonical.com>
+
+commit dd29dae00d39186890a5eaa2fe4ad8768bfd41a9 upstream.
+
+drivers/scsi/be2iscsi/be_main.c: In function 'be_sgl_create_contiguous':
+drivers/scsi/be2iscsi/be_main.c:3187:18: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
+  WARN_ON(!length > 0);
+
+gcc version 5.2.1
+
+Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
+Cc: Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
+Cc: Minh Tran <minh.tran@avagotech.com>
+Cc: John Soni Jose <sony.john-n@avagotech.com>
+Cc: "James E.J. Bottomley" <JBottomley@odin.com>
+Reported-by: Joel Stanley <joel@jms.id.au>
+Reviewed-by: Manoj Kumar <manoj@linux.vnet.ibm.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Cc: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/be2iscsi/be_main.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/be2iscsi/be_main.c
++++ b/drivers/scsi/be2iscsi/be_main.c
+@@ -3172,7 +3172,7 @@ be_sgl_create_contiguous(void *virtual_a
+ {
+       WARN_ON(!virtual_address);
+       WARN_ON(!physical_address);
+-      WARN_ON(!length > 0);
++      WARN_ON(!length);
+       WARN_ON(!sgl);
+       sgl->va = virtual_address;
diff --git a/queue-3.14/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch b/queue-3.14/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch
new file mode 100644 (file)
index 0000000..4328c19
--- /dev/null
@@ -0,0 +1,32 @@
+From 09a5c34e8d6b05663ec4c3d22b1fbd9fec89aaf9 Mon Sep 17 00:00:00 2001
+From: James C Boyd <jcboyd.dev@gmail.com>
+Date: Wed, 27 May 2015 17:09:06 -0500
+Subject: HID: hid-input: Add parentheses to quell gcc warning
+
+From: James C Boyd <jcboyd.dev@gmail.com>
+
+commit 09a5c34e8d6b05663ec4c3d22b1fbd9fec89aaf9 upstream.
+
+GCC reports a -Wlogical-not-parentheses warning here; therefore
+add parentheses to shut it up and to express our intent more.
+
+Signed-off-by: James C Boyd <jcboyd.dev@gmail.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Cc: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-input.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/hid/hid-input.c
++++ b/drivers/hid/hid-input.c
+@@ -1084,7 +1084,7 @@ void hidinput_hid_event(struct hid_devic
+               return;
+       /* report the usage code as scancode if the key status has changed */
+-      if (usage->type == EV_KEY && !!test_bit(usage->code, input->key) != value)
++      if (usage->type == EV_KEY && (!!test_bit(usage->code, input->key)) != value)
+               input_event(input, EV_MSC, MSC_SCAN, usage->hid);
+       input_event(input, usage->type, usage->code, value);
index 86ce4dd650e4ebfa9846505c5a60e37f11ac3938..b2a72bcc0e88645f974ecff3b574ff9842402250 100644 (file)
@@ -1 +1,5 @@
 revert-can-fix-handling-of-unmodifiable-configuration-options-fix.patch
+be2iscsi-fix-bogus-warn_on-length-check.patch
+hid-hid-input-add-parentheses-to-quell-gcc-warning.patch
+alsa-oxygen-fix-logical-not-parentheses-warning.patch
+stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch
diff --git a/queue-3.14/stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch b/queue-3.14/stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch
new file mode 100644 (file)
index 0000000..1ac47ba
--- /dev/null
@@ -0,0 +1,32 @@
+From 7e6bd12fb77b0067df13fb3ba3fadbdff2945396 Mon Sep 17 00:00:00 2001
+From: Alexander Shiyan <shc_work@mail.ru>
+Date: Tue, 25 Feb 2014 23:41:14 -0300
+Subject: [media] stb6100: fix buffer length check in stb6100_write_reg_range()
+
+From: Alexander Shiyan <shc_work@mail.ru>
+
+commit 7e6bd12fb77b0067df13fb3ba3fadbdff2945396 upstream.
+
+We are checking sizeof() the wrong variable!
+
+Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
+Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
+Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
+Cc: Willy Tarreau <w@1wt.eu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/dvb-frontends/stb6100.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/media/dvb-frontends/stb6100.c
++++ b/drivers/media/dvb-frontends/stb6100.c
+@@ -193,7 +193,7 @@ static int stb6100_write_reg_range(struc
+               .len    = len + 1
+       };
+-      if (1 + len > sizeof(buf)) {
++      if (1 + len > sizeof(cmdbuf)) {
+               printk(KERN_WARNING
+                      "%s: i2c wr: len=%d is too big!\n",
+                      KBUILD_MODNAME, len);