author: Prarit Bhargava <prarit@redhat.com> 2015-12-09 08:31:12 -0500
committer: Rafael J. Wysocki <rafael.j.wysocki@intel.com> 2015-12-12 02:31:11 +0100
commit: 79a21dbfae3cd40d5a801778071a9967b79c2c20
parent: 89e7b2553ae182a4b2a19e2e99a59ad0d3ccb1ed
Commit Summary:
Diffstat:
1 file changed, 5 insertions, 2 deletions
diff --git a/drivers/powercap/intel_rapl.c b/drivers/powercap/intel_rapl.c
index cc97f0869791..48747c28a43d 100644
--- 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 */
- 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);
- rd->state |= DOMAIN_STATE_BIOS_LOCKED;
+ rd->state |= DOMAIN_STATE_BIOS_LOCKED;
}
}