Skip to content

Commit 02ef7d3

Browse files
committed
Merge tag 'pm-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fixes from Rafael Wysocki: "These fix an error code path issue in a cpuidle driver and make the sleepgraph utility more robust against unexpected input. Specifics: - Fix the psci_pd_init_topology() failure path in the PSCI cpuidle driver (Shawn Guo) - Modify the sleepgraph utility so it does not crash on binary data in device names (Todd Brandt)" * tag 'pm-6.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: pm-graph: sleepgraph: Avoid crashing on binary data in device names cpuidle: psci: Iterate backwards over list in psci_pd_remove()
2 parents abb02a8 + 1fa9d47 commit 02ef7d3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

drivers/cpuidle/cpuidle-psci-domain.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ static void psci_pd_remove(void)
106106
struct psci_pd_provider *pd_provider, *it;
107107
struct generic_pm_domain *genpd;
108108

109-
list_for_each_entry_safe(pd_provider, it, &psci_pd_providers, link) {
109+
list_for_each_entry_safe_reverse(pd_provider, it,
110+
&psci_pd_providers, link) {
110111
of_genpd_del_provider(pd_provider->node);
111112

112113
genpd = of_genpd_remove_last(pd_provider->node);

tools/power/pm-graph/sleepgraph.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5556,9 +5556,8 @@ def executeSuspend(quiet=False):
55565556
if not quiet:
55575557
pprint('CAPTURING TRACE')
55585558
op = sv.writeDatafileHeader(sv.ftracefile, testdata)
5559-
fp = open(tp+'trace', 'r')
5560-
for line in fp:
5561-
op.write(line)
5559+
fp = open(tp+'trace', 'rb')
5560+
op.write(ascii(fp.read()))
55625561
op.close()
55635562
sv.fsetVal('', 'trace')
55645563
sv.platforminfo(cmdafter)

0 commit comments

Comments
 (0)