Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 907cc908 authored by Dirk Brandewie's avatar Dirk Brandewie Committed by Rafael J. Wysocki
Browse files

cpufreq / intel_pstate: Fix intel_pstate_init() error path 



If cpufreq_register_driver() fails just free memory that has been
allocated and return. intel_pstate_exit() function is removed since we
are built-in only now there is no reason for a module exit procedure.

Reported-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarDirk Brandewie <dirk.j.brandewie@intel.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 37530f2b

drivers/cpufreq/intel_pstate.c

+11 −28
Original line number Diff line number Diff line
@@ -747,37 +747,11 @@ static struct cpufreq_driver intel_pstate_driver = { 
	.owner		= THIS_MODULE,

};



static void intel_pstate_exit(void)

{

	int cpu;



	sysfs_remove_group(intel_pstate_kobject,

				&intel_pstate_attr_group);

	debugfs_remove_recursive(debugfs_parent);



	cpufreq_unregister_driver(&intel_pstate_driver);



	if (!all_cpu_data)

		return;



	get_online_cpus();

	for_each_online_cpu(cpu) {

		if (all_cpu_data[cpu]) {

			del_timer_sync(&all_cpu_data[cpu]->timer);

			kfree(all_cpu_data[cpu]);

		}

	}



	put_online_cpus();

	vfree(all_cpu_data);

}

module_exit(intel_pstate_exit);



static int __initdata no_load;



static int __init intel_pstate_init(void)

{

	int rc = 0;

	int cpu, rc = 0;

	const struct x86_cpu_id *id;



	if (no_load)
@@ -802,7 +776,16 @@ static int __init intel_pstate_init(void) 
	intel_pstate_sysfs_expose_params();

	return rc;

out:

	intel_pstate_exit();

	get_online_cpus();

	for_each_online_cpu(cpu) {

		if (all_cpu_data[cpu]) {

			del_timer_sync(&all_cpu_data[cpu]->timer);

			kfree(all_cpu_data[cpu]);

		}

	}



	put_online_cpus();

	vfree(all_cpu_data);

	return -ENODEV;

}

device_initcall(intel_pstate_init);