Signed-off-by: Sasha Levin alexander.levin@verizon.com --- ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-3.18/series | 1 - ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-4.14/series | 1 - ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-4.4/series | 1 - ...ix-error-handling-in-sony_nc_setup_rfkill.patch | 56 ---------------------- queue-4.9/series | 1 - 8 files changed, 228 deletions(-) delete mode 100644 queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch delete mode 100644 queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch delete mode 100644 queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch delete mode 100644 queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch

diff --git a/queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index 29eccbffe..000000000 --- a/queue-3.18/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 15:03:25 CET 2017 -From: Markus Elfring elfring@users.sourceforge.net -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring elfring@users.sourceforge.net - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko andy.shevchenko@gmail.com -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg@mail.gmail.com -Signed-off-by: Markus Elfring elfring@users.sourceforge.net -Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com -Signed-off-by: Sasha Levin alexander.levin@verizon.com -Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1654,17 +1654,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-3.18/series b/queue-3.18/series index ed60ddbc4..8525d16ff 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -43,7 +43,6 @@ pci-pme-handle-invalid-data-when-reading-root-status.patch powerpc-powernv-cpufreq-fix-the-frequency-read-by-proc-cpuinfo.patch powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch target-fix-condition-return-in-core_pr_dump_initiator_port.patch diff --git a/queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index 80673c2e3..000000000 --- a/queue-4.14/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 13:28:59 CET 2017 -From: Markus Elfring elfring@users.sourceforge.net -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring elfring@users.sourceforge.net - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko andy.shevchenko@gmail.com -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg@mail.gmail.com -Signed-off-by: Markus Elfring elfring@users.sourceforge.net -Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com -Signed-off-by: Sasha Levin alexander.levin@verizon.com -Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-4.14/series b/queue-4.14/series index 8d3089853..7e1d0f7a3 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -68,7 +68,6 @@ powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch powerpc-pseries-vio-dispose-of-virq-mapping-on-vdevice-unregister.patch platform-x86-intel_punit_ipc-fix-resource-ioremap-warning.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-detect-conn_cmd_list-corruption-early.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch diff --git a/queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index 7dd8d3d60..000000000 --- a/queue-4.4/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 14:47:43 CET 2017 -From: Markus Elfring elfring@users.sourceforge.net -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring elfring@users.sourceforge.net - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko andy.shevchenko@gmail.com -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg@mail.gmail.com -Signed-off-by: Markus Elfring elfring@users.sourceforge.net -Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com -Signed-off-by: Sasha Levin alexander.levin@verizon.com -Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1655,17 +1655,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-4.4/series b/queue-4.4/series index d52e15576..d1ebd64a3 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -76,7 +76,6 @@ powerpc-powernv-cpufreq-fix-the-frequency-read-by-proc-cpuinfo.patch netfilter-ipvs-fix-inappropriate-output-of-procfs.patch powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch target-fix-condition-return-in-core_pr_dump_initiator_port.patch diff --git a/queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch b/queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch deleted file mode 100644 index be1bf544f..000000000 --- a/queue-4.9/platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Mon Dec 18 14:12:35 CET 2017 -From: Markus Elfring elfring@users.sourceforge.net -Date: Wed, 1 Nov 2017 18:42:45 +0100 -Subject: platform/x86: sony-laptop: Fix error handling in sony_nc_setup_rfkill() - -From: Markus Elfring elfring@users.sourceforge.net - - -[ Upstream commit f6c8a317ab208aee223776327c06f23342492d54 ] - -Source code review for a specific software refactoring showed the need -for another correction because the error code "-1" was returned so far -if a call of the function "sony_call_snc_handle" failed here. -Thus assign the return value from these two function calls also to -the variable "err" and provide it in case of a failure. - -Fixes: d6f15ed876b83a1a0eba1d0473eef58acc95444a ("sony-laptop: use soft rfkill status stored in hw") -Suggested-by: Andy Shevchenko andy.shevchenko@gmail.com -Link: https://lkml.org/lkml/2017/10/31/463 -Link: https://lkml.kernel.org/r/CAHp75VcMkXCioCzmLE0+BTmkqc5RSOx9yPO0ectVHMrMvewgwg@mail.gmail.com -Signed-off-by: Markus Elfring elfring@users.sourceforge.net -Signed-off-by: Andy Shevchenko andriy.shevchenko@linux.intel.com -Signed-off-by: Sasha Levin alexander.levin@verizon.com -Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org ---- - drivers/platform/x86/sony-laptop.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/drivers/platform/x86/sony-laptop.c -+++ b/drivers/platform/x86/sony-laptop.c -@@ -1660,17 +1660,19 @@ static int sony_nc_setup_rfkill(struct a - if (!rfk) - return -ENOMEM; - -- if (sony_call_snc_handle(sony_rfkill_handle, 0x200, &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, 0x200, &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - hwblock = !(result & 0x1); - -- if (sony_call_snc_handle(sony_rfkill_handle, -- sony_rfkill_address[nc_type], -- &result) < 0) { -+ err = sony_call_snc_handle(sony_rfkill_handle, -+ sony_rfkill_address[nc_type], -+ &result); -+ if (err < 0) { - rfkill_destroy(rfk); -- return -1; -+ return err; - } - swblock = !(result & 0x2); - diff --git a/queue-4.9/series b/queue-4.9/series index ddb7a33cf..295f28ae2 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -121,7 +121,6 @@ netfilter-ipvs-fix-inappropriate-output-of-procfs.patch powerpc-opal-fix-ebusy-bug-in-acquiring-tokens.patch powerpc-ipic-fix-status-get-and-status-clear.patch platform-x86-intel_punit_ipc-fix-resource-ioremap-warning.patch -platform-x86-sony-laptop-fix-error-handling-in-sony_nc_setup_rfkill.patch target-iscsi-fix-a-race-condition-in-iscsit_add_reject_from_cmd.patch iscsi-target-fix-memory-leak-in-lio_target_tiqn_addtpg.patch target-fix-condition-return-in-core_pr_dump_initiator_port.patch