build/patch/kernel/meson64-legacy/patch-4.9.242-243.patch
Igor Pečovnik e833e2589c
Move Odroid C4 from legacy u-boot toward mainline (#2350)
- move Odroid C4 from legacy u-boot toward mainline
- get rid of dirty legacy u-boot code
- get rid of FAT boot partition
- briefly tested
- both kernels can operate with one standard boot script
- add upstream patch and adjust config
- fix console
- don't clock C4 too high by default
2020-11-22 13:47:41 +01:00

28 lines
893 B
Diff

diff --git a/Makefile b/Makefile
index d41de2c1159e7..c6fcfe4bfeed5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
VERSION = 4
PATCHLEVEL = 9
-SUBLEVEL = 242
+SUBLEVEL = 243
EXTRAVERSION =
NAME = Roaring Lionus
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
index 5b10b50f8686f..5c064df7d81f1 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;
}