projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
thermal: rockchip: rk3368: fix efuse value of temp ajust code issue
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
powercap
/
intel_rapl.c
diff --git
a/drivers/powercap/intel_rapl.c
b/drivers/powercap/intel_rapl.c
index cc97f0869791d371c85f7e21c0ca04e1e595ac23..48747c28a43d4ac2fc1bed10f29cd1224ddd10f0 100644
(file)
--- a/
drivers/powercap/intel_rapl.c
+++ b/
drivers/powercap/intel_rapl.c
@@
-1341,10
+1341,13
@@
static int rapl_detect_domains(struct rapl_package *rp, int cpu)
for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) {
/* check if the domain is locked by BIOS */
for (rd = rp->domains; rd < rp->domains + rp->nr_domains; rd++) {
/* check if the domain is locked by BIOS */
- if (rapl_read_data_raw(rd, FW_LOCK, false, &locked)) {
+ ret = rapl_read_data_raw(rd, FW_LOCK, false, &locked);
+ if (ret)
+ return ret;
+ if (locked) {
pr_info("RAPL package %d domain %s locked by BIOS\n",
rp->id, rd->name);
pr_info("RAPL package %d domain %s locked by BIOS\n",
rp->id, rd->name);
-
rd->state |= DOMAIN_STATE_BIOS_LOCKED;
+ rd->state |= DOMAIN_STATE_BIOS_LOCKED;
}
}
}
}