TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 4.19.157 into android-4.19-stable

Browse Source 
Changes in 4.19.157
	powercap: restrict energy meter to root access
	Linux 4.19.157

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie418582e2db8a7f2f1eb4f1034fe530e0132afe3
This commit is contained in:
Greg Kroah-Hartman
2020-11-11 11:16:11 +01:00
parent be047631de 31acccdc87
commit 8ee67bc843
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 4 VERSION = 4
PATCHLEVEL = 19 PATCHLEVEL = 19
SUBLEVEL = 156 SUBLEVEL = 157
EXTRAVERSION = EXTRAVERSION =
NAME = "People's Front" NAME = "People's Front"

4
drivers/powercap/powercap_sys.c
View File

@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
&dev_attr_max_energy_range_uj.attr; &dev_attr_max_energy_range_uj.attr;
if (power_zone->ops->get_energy_uj) { if (power_zone->ops->get_energy_uj) {
if (power_zone->ops->reset_energy_uj) if (power_zone->ops->reset_energy_uj)
dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO; dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUSR;
else else
dev_attr_energy_uj.attr.mode = S_IRUGO; dev_attr_energy_uj.attr.mode = S_IRUSR;
power_zone->zone_dev_attrs[count++] = power_zone->zone_dev_attrs[count++] =
&dev_attr_energy_uj.attr; &dev_attr_energy_uj.attr;
} }