Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwmon-for-v6.8-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmonfix from Guenter Roeck:
"Fix crash seen when instantiating npcm750-pwm-fan"
* tag 'hwmon-for-v6.8-p2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (npcm750-pwm-fan) Fix crash observed when instantiating nuvoton,npcm750-pwm-fan
+5
-2
+5
-2
drivers/hwmon/npcm750-pwm-fan.c
+5
-2
drivers/hwmon/npcm750-pwm-fan.c
···
195
195
struct npcm7xx_pwm_fan_data {
196
196
void __iomem *pwm_base;
197
197
void __iomem *fan_base;
198
+
int pwm_modules;
198
199
unsigned long pwm_clk_freq;
199
200
unsigned long fan_clk_freq;
200
201
struct clk *pwm_clk;
···
711
710
/* Setting PWM Prescale Register value register to both modules */
712
711
prescale_val |= (prescale_val << NPCM7XX_PWM_PRESCALE_SHIFT_CH01);
713
712
714
-
for (m = 0; m < NPCM7XX_PWM_MAX_MODULES ; m++) {
713
+
for (m = 0; m < data->pwm_modules; m++) {
715
714
iowrite32(prescale_val, NPCM7XX_PWM_REG_PR(data->pwm_base, m));
716
715
iowrite32(NPCM7XX_PWM_PRESCALE2_DEFAULT,
717
716
NPCM7XX_PWM_REG_CSR(data->pwm_base, m));
···
947
946
if (!data->info)
948
947
return -EINVAL;
949
948
949
+
data->pwm_modules = data->info->pwm_max_channel / NPCM7XX_PWM_MAX_CHN_NUM_IN_A_MODULE;
950
+
950
951
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pwm");
951
952
if (!res) {
952
953
dev_err(dev, "pwm resource not found\n");
···
986
983
output_freq = npcm7xx_pwm_init(data);
987
984
npcm7xx_fan_init(data);
988
985
989
-
for (cnt = 0; cnt < NPCM7XX_PWM_MAX_MODULES ; cnt++)
986
+
for (cnt = 0; cnt < data->pwm_modules; cnt++)
990
987
mutex_init(&data->pwm_lock[cnt]);
991
988
992
989
for (i = 0; i < NPCM7XX_FAN_MAX_MODULE; i++) {