Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ee67bc8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.157 into android-4.19-stable 



Changes in 4.19.157
	powercap: restrict energy meter to root access
	Linux 4.19.157

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie418582e2db8a7f2f1eb4f1034fe530e0132afe3
parents be047631 31acccdc

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 156

SUBLEVEL = 157

EXTRAVERSION =

NAME = "People's Front"

drivers/powercap/powercap_sys.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}