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

Commit eeb31110 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: cpuidle: lpm-levels: Return non-zero error in .select" into msm-4.8

parents 98eb9afd 514248db

drivers/cpuidle/lpm-levels-of.c

+6 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -295,7 +295,11 @@ static int create_cpu_lvl_nodes(struct lpm_cluster *p, struct kobject *parent) 
			goto release_kobj;

		}



		for (i = 0; i < p->cpu->nlevels; i++) {

		/*

		 * Skip enable/disable for WFI. cpuidle expects WFI to be

		 * available at all times.

		 */

		for (i = 1; i < p->cpu->nlevels; i++) {



			ret = create_lvl_avail_nodes(p->cpu->levels[i].name,

					cpu_kobj[cpu_idx], &level_list[i],

drivers/cpuidle/lpm-levels.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 * Copyright (C) 2006-2007 Adam Belay <abelay@novell.com>

 * Copyright (C) 2009 Intel Corporation

 *
@@ -1485,7 +1485,7 @@ static int lpm_cpuidle_select(struct cpuidle_driver *drv, 
	idx = cpu_power_select(dev, cluster->cpu);



	if (idx < 0)

		return -EPERM;

		return 0;



	return idx;

}