git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[sfrench/cifs-2.6.git]
/
drivers
/
hwmon
/
w83781d.c
diff --git
a/drivers/hwmon/w83781d.c
b/drivers/hwmon/w83781d.c
index dbfb30c588d8cfea06d59ab240dce5e2d07cde15..0bdab959b7369335672f7cd09b01386a15054472 100644
(file)
--- 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;
}