diff options
author | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-19 01:36:29 +0200 |
---|---|---|
committer | Igor Opaniuk <igor.opaniuk@toradex.com> | 2020-11-19 02:06:32 +0200 |
commit | 03517bb5131e97de016170ed338537d9a340baf8 (patch) | |
tree | 08fe271d065adf07936bc572e5981c1ce9fdb758 | |
parent | d96d648dcbbcdf5ecd69193772efe982aafb70d5 (diff) | |
parent | 2544d06afd8d060f35b159809274e4b7477e63e8 (diff) |
Merge tag 'v5.4.77' into 5.4-2.1.x-imx
This is the 5.4.77 stable release
Merge conflicts:
Merged automatically, no conflicts
Signed-off-by: Igor Opaniuk <igor.opaniuk@toradex.com>
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | drivers/powercap/powercap_sys.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 76 +SUBLEVEL = 77 EXTRAVERSION = NAME = Kleptomaniac Octopus diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c index f808c5fa9838..3f0b8e2ef3d4 100644 --- a/drivers/powercap/powercap_sys.c +++ b/drivers/powercap/powercap_sys.c @@ -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; } |