[PATCH] acpi-cpufreq: Skip cleanup if initialization didn't occur

[kyle.meyer@hpe.com]

From: Kyle Meyer <kyle.meyer@hpe.com>

acpi-cpufreq is loaded without performing initialization when a cpufreq
driver exists.

If initialization didn't occur then skip cleanup in acpi_cpufreq_exit().
This prevents unnecessary freeing and unregistering when the module is
unloaded.

Reported-by: Takashi Iwai <tiwai@suse.com>
Signed-off-by: Kyle Meyer <kyle.meyer@hpe.com>
---
 drivers/cpufreq/acpi-cpufreq.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
index 7e7450453714..8d425f14c267 100644
--- a/drivers/cpufreq/acpi-cpufreq.c
+++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -1042,8 +1042,19 @@ static int __init acpi_cpufreq_init(void)
 
 static void __exit acpi_cpufreq_exit(void)
 {
+	const char *current_driver;
+
 	pr_debug("%s\n", __func__);
 
+	/*
+	 * If another cpufreq_driver was loaded, preventing acpi-cpufreq from
+	 * registering, there's no need to unregister it.
+	 */
+	current_driver = cpufreq_get_current_driver();
+	if (!current_driver ||
+	    strncmp(current_driver, acpi_cpufreq_driver.name, strlen(acpi_cpufreq_driver.name)))
+		return;
+
 	acpi_cpufreq_boost_exit();
 
 	cpufreq_unregister_driver(&acpi_cpufreq_driver);
-- 
2.25.1