Merge 4.4.243 into Mystic-4.4

Changes in 4.4.243: (2 commits) powercap: restrict energy meter to root access Linux 4.4.243 Signed-off-by: Oktapra Amtono <oktapra.amtono@gmail.com>
okta-10 · Nov 11, 2020 · 6d6b2c0 · 6d6b2c0
2 parents 0f48cfa + 04d2479
commit 6d6b2c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 4
-SUBLEVEL = 242
+SUBLEVEL = 243
 EXTRAVERSION =
 NAME = Blurry Fish Butt
 

diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
@@ -379,9 +379,9 @@ static void create_power_zone_common_attributes(
 					&dev_attr_max_energy_range_uj.attr;
 	if (power_zone->ops->get_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
-			dev_attr_energy_uj.attr.mode = S_IRUGO;
+			dev_attr_energy_uj.attr.mode = S_IRUSR;
 		power_zone->zone_dev_attrs[count++] =
 					&dev_attr_energy_uj.attr;
 	}