diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-04-10 10:14:42 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-04-10 10:14:42 +0300 |
commit | 54bbfe75cbb10384b0a62efae80fde21deea1dd0 (patch) | |
tree | eed22c29cdecce36153bbb83ee7a9da7eed60ccd /drivers/hwmon/occ/common.c | |
parent | ddb20d1d3aed8f130519c0a29cd5392efcc067b8 (diff) | |
parent | 771acc7e4a6e5dba779cb1a7fd851a164bc81033 (diff) | |
download | linux-54bbfe75cbb10384b0a62efae80fde21deea1dd0.tar.xz |
Merge branch 'linus' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/hwmon/occ/common.c')
-rw-r--r-- | drivers/hwmon/occ/common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/hwmon/occ/common.c b/drivers/hwmon/occ/common.c index b91a80abf724..4679acb4918e 100644 --- a/drivers/hwmon/occ/common.c +++ b/drivers/hwmon/occ/common.c @@ -890,6 +890,8 @@ static int occ_setup_sensor_attrs(struct occ *occ) s++; } } + + s = (sensors->power.num_sensors * 4) + 1; } else { for (i = 0; i < sensors->power.num_sensors; ++i) { s = i + 1; @@ -918,11 +920,11 @@ static int occ_setup_sensor_attrs(struct occ *occ) show_power, NULL, 3, i); attr++; } - } - if (sensors->caps.num_sensors >= 1) { s = sensors->power.num_sensors + 1; + } + if (sensors->caps.num_sensors >= 1) { snprintf(attr->name, sizeof(attr->name), "power%d_label", s); attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL, 0, 0); |