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

Commit 5a4bbd01 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq:
  [CPUFREQ] Fix memory leaks in pcc_cpufreq_do_osc
  [CPUFREQ] acpi-cpufreq: add missing __percpu markup
parents 989cd445 36829306

arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c

+12 −6
Original line number Diff line number Diff line
@@ -368,16 +368,22 @@ static int __init pcc_cpufreq_do_osc(acpi_handle *handle) 
		return -ENODEV;



	out_obj = output.pointer;

	if (out_obj->type != ACPI_TYPE_BUFFER)

		return -ENODEV;

	if (out_obj->type != ACPI_TYPE_BUFFER) {

		ret = -ENODEV;

		goto out_free;

	}



	errors = *((u32 *)out_obj->buffer.pointer) & ~(1 << 0);

	if (errors)

		return -ENODEV;

	if (errors) {

		ret = -ENODEV;

		goto out_free;

	}



	supported = *((u32 *)(out_obj->buffer.pointer + 4));

	if (!(supported & 0x1))

		return -ENODEV;

	if (!(supported & 0x1)) {

		ret = -ENODEV;

		goto out_free;

	}



out_free:

	kfree(output.pointer);