diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
commit | b3e30c9884407599353e690a4eb36d0c4671bf62 (patch) | |
tree | d752d32d8a1a395cacd220313f24b933b2ed7294 /drivers/hwmon/occ/common.c | |
parent | 342061c53a049569fc7f56d237753c26b4b2166d (diff) | |
parent | a55aa89aab90fae7c815b0551b07be37db359d76 (diff) | |
download | linux-b3e30c9884407599353e690a4eb36d0c4671bf62.tar.gz |
Merge tag 'v5.3-rc6' into x86/cpu, 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 a7d2b16dd702..30e18eb60da7 100644 --- a/drivers/hwmon/occ/common.c +++ b/drivers/hwmon/occ/common.c @@ -408,8 +408,10 @@ static ssize_t occ_show_power_1(struct device *dev, static u64 occ_get_powr_avg(u64 *accum, u32 *samples) { - return div64_u64(get_unaligned_be64(accum) * 1000000ULL, - get_unaligned_be32(samples)); + u64 divisor = get_unaligned_be32(samples); + + return (divisor == 0) ? 0 : + div64_u64(get_unaligned_be64(accum) * 1000000ULL, divisor); } static ssize_t occ_show_power_2(struct device *dev, |