redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge pull request #173 from igoropaniuk/5.4-2.2.x-imx 

Update 5.4-2.2.x-imx to v5.4.77 from stable
5.4-rM2-2.2.x-imx-squashed
Otavio Salvador 2020-11-18 21:52:34 -03:00 committed by GitHub
parent 19f584db29 d4c3adc6be
commit 9f5b96102a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats 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
VERSION = 5
PATCHLEVEL = 4
SUBLEVEL = 76
SUBLEVEL = 77
EXTRAVERSION =
NAME = Kleptomaniac Octopus

4
drivers/powercap/powercap_sys.c
View File

@ -367,9 +367,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;
}