Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220495
b: refs/heads/master
c: 7eb8d50
h: refs/heads/master
i:
  220493: f5ac851
  220491: 478ffa6
  220487: bf5e3b6
  220479: 6fe1164
v: v3
  • Loading branch information
Jean Delvare authored and Jean Delvare committed Oct 28, 2010
1 parent 1db0dbf commit 1ac081f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a654b9d4e7152b06557e2f22bcf0a245bc88bc98
refs/heads/master: 7eb8d508b5cfabbb147670ee063438469d94c465
8 changes: 4 additions & 4 deletions trunk/drivers/hwmon/w83795.c
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ static const u8 IN_LSB_SHIFT_IDX[][2] = {
#define W83795_REG_FAN_MIN_HL(index) (0xB6 + (index))
#define W83795_REG_FAN_MIN_LSB(index) (0xC4 + (index) / 2)
#define W83795_REG_FAN_MIN_LSB_SHIFT(index) \
(((index) % 1) ? 4 : 0)
(((index) & 1) ? 4 : 0)

#define W83795_REG_VID_CTRL 0x6A

Expand Down Expand Up @@ -670,7 +670,7 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
data->fan_min[index] = val;
w83795_write(client, W83795_REG_FAN_MIN_HL(index), (val >> 4) & 0xff);
val &= 0x0f;
if (index % 1) {
if (index & 1) {
val <<= 4;
val |= w83795_read(client, W83795_REG_FAN_MIN_LSB(index))
& 0x0f;
Expand Down Expand Up @@ -823,7 +823,7 @@ show_temp_src(struct device *dev, struct device_attribute *attr, char *buf)
u8 val = index / 2;
u8 tmp = data->temp_src[val];

if (index % 1)
if (index & 1)
val = 4;
else
val = 0;
Expand All @@ -850,7 +850,7 @@ store_temp_src(struct device *dev, struct device_attribute *attr,
tmp = SENSORS_LIMIT(tmp, 0, 15);

mutex_lock(&data->update_lock);
if (index % 1) {
if (index & 1) {
tmp <<= 4;
data->temp_src[val] &= 0x0f;
} else {
Expand Down

0 comments on commit 1ac081f

Please sign in to comment.