From: Greg Kroah-Hartman Date: Fri, 9 Sep 2016 11:36:39 +0000 (+0200) Subject: 3.14-stable patches X-Git-Tag: v3.14.79~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b548f57a4f51685310183c9213fc261fcb8fa00f;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches 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 --- 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 index 00000000000..c032a72552e --- /dev/null +++ b/queue-3.14/alsa-oxygen-fix-logical-not-parentheses-warning.patch @@ -0,0 +1,32 @@ +From 8ec7cfce3762299ae289c384e281b2f4010ae231 Mon Sep 17 00:00:00 2001 +From: Tomer Barletz +Date: Sun, 2 Aug 2015 02:08:57 -0700 +Subject: ALSA: oxygen: Fix logical-not-parentheses warning + +From: Tomer Barletz + +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 +Signed-off-by: Takashi Iwai +Cc: Willy Tarreau +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..4a80bcd05f7 --- /dev/null +++ b/queue-3.14/be2iscsi-fix-bogus-warn_on-length-check.patch @@ -0,0 +1,41 @@ +From dd29dae00d39186890a5eaa2fe4ad8768bfd41a9 Mon Sep 17 00:00:00 2001 +From: Tim Gardner +Date: Fri, 30 Oct 2015 12:22:58 -0600 +Subject: be2iscsi: Fix bogus WARN_ON length check + +From: Tim Gardner + +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 +Cc: Jayamohan Kallickal +Cc: Minh Tran +Cc: John Soni Jose +Cc: "James E.J. Bottomley" +Reported-by: Joel Stanley +Reviewed-by: Manoj Kumar +Signed-off-by: Martin K. Petersen +Cc: Willy Tarreau +Signed-off-by: Greg Kroah-Hartman + +--- + 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 index 00000000000..4328c19aa62 --- /dev/null +++ b/queue-3.14/hid-hid-input-add-parentheses-to-quell-gcc-warning.patch @@ -0,0 +1,32 @@ +From 09a5c34e8d6b05663ec4c3d22b1fbd9fec89aaf9 Mon Sep 17 00:00:00 2001 +From: James C Boyd +Date: Wed, 27 May 2015 17:09:06 -0500 +Subject: HID: hid-input: Add parentheses to quell gcc warning + +From: James C Boyd + +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 +Signed-off-by: Jiri Kosina +Cc: Willy Tarreau +Signed-off-by: Greg Kroah-Hartman + +--- + 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); diff --git a/queue-3.14/series b/queue-3.14/series index 86ce4dd650e..b2a72bcc0e8 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -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 index 00000000000..1ac47ba80cd --- /dev/null +++ b/queue-3.14/stb6100-fix-buffer-length-check-in-stb6100_write_reg_range.patch @@ -0,0 +1,32 @@ +From 7e6bd12fb77b0067df13fb3ba3fadbdff2945396 Mon Sep 17 00:00:00 2001 +From: Alexander Shiyan +Date: Tue, 25 Feb 2014 23:41:14 -0300 +Subject: [media] stb6100: fix buffer length check in stb6100_write_reg_range() + +From: Alexander Shiyan + +commit 7e6bd12fb77b0067df13fb3ba3fadbdff2945396 upstream. + +We are checking sizeof() the wrong variable! + +Signed-off-by: Alexander Shiyan +Signed-off-by: Michael Krufky +Signed-off-by: Mauro Carvalho Chehab +Cc: Willy Tarreau +Signed-off-by: Greg Kroah-Hartman + +--- + 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);