diff options
| author | David S. Miller <davem@davemloft.net> | 2018-10-12 21:38:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-12 21:38:46 -0700 |
| commit | d864991b220b7c62e81d21209e1fd978fd67352c (patch) | |
| tree | b570a1ad6fc1b959c5bcda6ceca0b321319c01e0 /drivers/hwmon/npcm750-pwm-fan.c | |
| parent | a688c53a0277d8ea21d86a5c56884892e3442c5e (diff) | |
| parent | bab5c80b211035739997ebd361a679fa85b39465 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/hwmon/npcm750-pwm-fan.c')
| -rw-r--r-- | drivers/hwmon/npcm750-pwm-fan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/npcm750-pwm-fan.c b/drivers/hwmon/npcm750-pwm-fan.c index 8474d601aa63..b998f9fbed41 100644 --- a/drivers/hwmon/npcm750-pwm-fan.c +++ b/drivers/hwmon/npcm750-pwm-fan.c @@ -908,7 +908,7 @@ static int npcm7xx_en_pwm_fan(struct device *dev, if (fan_cnt < 1) return -EINVAL; - fan_ch = devm_kzalloc(dev, sizeof(*fan_ch) * fan_cnt, GFP_KERNEL); + fan_ch = devm_kcalloc(dev, fan_cnt, sizeof(*fan_ch), GFP_KERNEL); if (!fan_ch) return -ENOMEM; |