On Friday, October 25, 2013 07:19:57 PM Viresh Kumar wrote: > On 25 October 2013 16:40, Rafael J. Wysocki <[email protected]> wrote: > > --- > > drivers/cpufreq/acpi-cpufreq.c | 8 ++++---- > > 1 file changed, 4 insertions(+), 4 deletions(-) > > > > Index: linux-pm/drivers/cpufreq/acpi-cpufreq.c > > =================================================================== > > --- linux-pm.orig/drivers/cpufreq/acpi-cpufreq.c > > +++ linux-pm/drivers/cpufreq/acpi-cpufreq.c > > @@ -986,12 +986,12 @@ static int __init acpi_cpufreq_init(void > > { > > int ret; > > > > + if (acpi_disabled) > > + return -ENODEV; > > + > > /* don't keep reloading if cpufreq_driver exists */ > > if (cpufreq_get_current_driver()) > > - return 0; > > - > > - if (acpi_disabled) > > - return 0; > > + return -EEXIST; > > > > pr_debug("acpi_cpufreq_init\n"); > > Even better, > > Acked-by: Viresh Kumar <[email protected]>
It doesn't lead to any unpleasant side effects on my laptop, so I'm adding it to my queue of fixes for 3.12-rc7. Thanks! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
