From: Greg Kroah-Hartman Date: Mon, 24 Sep 2018 10:49:34 +0000 (+0200) Subject: drop devfreq patch from 4.9 and 4.14. X-Git-Tag: v3.18.123~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5223dc54a226c2fb79d7ad2ea330e3aa0970986;p=thirdparty%2Fkernel%2Fstable-queue.git drop devfreq patch from 4.9 and 4.14. --- diff --git a/queue-4.14/pm-devfreq-use-put_device-instead-of-kfree.patch b/queue-4.14/pm-devfreq-use-put_device-instead-of-kfree.patch deleted file mode 100644 index 10d6e1efcb1..00000000000 --- a/queue-4.14/pm-devfreq-use-put_device-instead-of-kfree.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Mon Sep 24 09:35:12 CEST 2018 -From: Arvind Yadav -Date: Fri, 30 Mar 2018 17:14:03 +0530 -Subject: PM / devfreq: use put_device() instead of kfree() - -From: Arvind Yadav - -[ Upstream commit 2d803dc8f7a5f622ac47c3b650834ada3a2659b9 ] - -Never directly free @dev after calling device_register() or -device_unregister(), even if device_register() returned an error. -Always use put_device() to give up the reference initialized. - -Signed-off-by: Arvind Yadav -Reviewed-by: Chanwoo Choi -Signed-off-by: MyungJoo Ham -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/devfreq/devfreq.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/devfreq/devfreq.c -+++ b/drivers/devfreq/devfreq.c -@@ -564,7 +564,8 @@ struct devfreq *devfreq_add_device(struc - err = device_register(&devfreq->dev); - if (err) { - mutex_unlock(&devfreq->lock); -- goto err_dev; -+ put_device(&devfreq->dev); -+ goto err_out; - } - - devfreq->trans_table = devm_kzalloc(&devfreq->dev, -@@ -610,6 +611,7 @@ err_init: - mutex_unlock(&devfreq_list_lock); - - device_unregister(&devfreq->dev); -+ devfreq = NULL; - err_dev: - if (devfreq) - kfree(devfreq); diff --git a/queue-4.14/series b/queue-4.14/series index f5c2a31f79d..6d52d4c0649 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -114,7 +114,6 @@ bluetooth-use-lock_sock_nested-in-bt_accept_enqueue.patch evm-don-t-deadlock-if-a-crypto-algorithm-is-unavailable.patch kvm-ppc-book3s-hv-add-of_node_put-in-success-path.patch security-check-for-kstrdup-failure-in-lsm_append.patch -pm-devfreq-use-put_device-instead-of-kfree.patch mips-loongson64-cs5536-fix-pci_ohci_int_reg-reads.patch configfs-fix-registered-group-removal.patch pinctrl-rza1-fix-selector-use-for-groups-and-functions.patch diff --git a/queue-4.9/pm-devfreq-use-put_device-instead-of-kfree.patch b/queue-4.9/pm-devfreq-use-put_device-instead-of-kfree.patch deleted file mode 100644 index 2407b046dfe..00000000000 --- a/queue-4.9/pm-devfreq-use-put_device-instead-of-kfree.patch +++ /dev/null @@ -1,42 +0,0 @@ -From foo@baz Mon Sep 24 09:32:39 CEST 2018 -From: Arvind Yadav -Date: Fri, 30 Mar 2018 17:14:03 +0530 -Subject: PM / devfreq: use put_device() instead of kfree() - -From: Arvind Yadav - -[ Upstream commit 2d803dc8f7a5f622ac47c3b650834ada3a2659b9 ] - -Never directly free @dev after calling device_register() or -device_unregister(), even if device_register() returned an error. -Always use put_device() to give up the reference initialized. - -Signed-off-by: Arvind Yadav -Reviewed-by: Chanwoo Choi -Signed-off-by: MyungJoo Ham -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/devfreq/devfreq.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/devfreq/devfreq.c -+++ b/drivers/devfreq/devfreq.c -@@ -574,7 +574,8 @@ struct devfreq *devfreq_add_device(struc - err = device_register(&devfreq->dev); - if (err) { - mutex_unlock(&devfreq->lock); -- goto err_dev; -+ put_device(&devfreq->dev); -+ goto err_out; - } - - devfreq->trans_table = devm_kzalloc(&devfreq->dev, sizeof(unsigned int) * -@@ -618,6 +619,7 @@ err_init: - mutex_unlock(&devfreq_list_lock); - - device_unregister(&devfreq->dev); -+ devfreq = NULL; - err_dev: - if (devfreq) - kfree(devfreq); diff --git a/queue-4.9/series b/queue-4.9/series index 7428023069e..7f569f3f6ee 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -74,7 +74,6 @@ binfmt_elf-respect-error-return-from-regset-active.patch audit-fix-use-after-free-in-audit_add_watch.patch mtdchar-fix-overflows-in-adjustment-of-count.patch evm-don-t-deadlock-if-a-crypto-algorithm-is-unavailable.patch -pm-devfreq-use-put_device-instead-of-kfree.patch mips-loongson64-cs5536-fix-pci_ohci_int_reg-reads.patch configfs-fix-registered-group-removal.patch efi-esrt-only-call-efi_mem_reserve-for-boot-services-memory.patch