29 lines
895 B
Diff
29 lines
895 B
Diff
|
diff --git a/Makefile b/Makefile
|
||
|
|
index 0ba3fd9144264..99badda272d74 100644
|
||
|
|
--- 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
|
||
|
|
index fd12ccc11e262..2313bb93f5c2e 100644
|
||
|
|
--- 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;
|
||
|
|
}
|