diff options
| author | Jean Delvare <khali@linux-fr.org> | 2009-05-08 20:27:28 +0200 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-05-08 20:27:28 +0200 |
| commit | 848ddf116b3d1711c956fac8627be12dfe8d736f (patch) | |
| tree | 59b9f5dcd4b652e127f0908ab162536d588ad0fc /drivers/hwmon/w83781d.c | |
| parent | b9008708f24de8fb9bdbfb5d3b27e36d5a357eda (diff) | |
| download | linux-3.10-848ddf116b3d1711c956fac8627be12dfe8d736f.tar.gz linux-3.10-848ddf116b3d1711c956fac8627be12dfe8d736f.tar.bz2 linux-3.10-848ddf116b3d1711c956fac8627be12dfe8d736f.zip | |
hwmon: (w83781d) Fix W83782D support (NULL pointer dereference)
Commit 360782dde00a2e6e7d9fd57535f90934707ab8a8 (hwmon: (w83781d) Stop
abusing struct i2c_client for ISA devices) broke W83782D support for
devices connected on the ISA bus. You will hit a NULL pointer
dereference as soon as you read any device attribute. Other devices,
and W83782D devices on the SMBus, aren't affected.
Reported-by: Michel Abraham
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Tested-by: Michel Abraham
Diffstat (limited to 'drivers/hwmon/w83781d.c')
| -rw-r--r-- | drivers/hwmon/w83781d.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hwmon/w83781d.c b/drivers/hwmon/w83781d.c index dbfb30c588d..0bdab959b73 100644 --- a/drivers/hwmon/w83781d.c +++ b/drivers/hwmon/w83781d.c @@ -1462,7 +1462,8 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) data->pwm[i] = w83781d_read_value(data, W83781D_REG_PWM[i]); - if ((data->type != w83782d || !client->driver) + /* Only W83782D on SMBus has PWM3 and PWM4 */ + if ((data->type != w83782d || !client) && i == 1) break; } |