diff options
| author | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-02-23 21:33:05 -0600 |
| commit | a0c034c3726715d1928b301ddd43c51799c0c07a (patch) | |
| tree | 76e78b4646ca0560d8cd0ee041a8bde9a5269c8c /drivers/hwmon/f75375s.c | |
| parent | 086290148fc37d7f2eccb7026b18fb9539ec7820 (diff) | |
| parent | 9d0231c207faeda051cf54c1a64e1a147d2187fa (diff) | |
Merge commit 'v3.2.7' into rt-3.2.7-rt13v3.2.7-rt13
Diffstat (limited to 'drivers/hwmon/f75375s.c')
| -rw-r--r-- | drivers/hwmon/f75375s.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index 95cbfb3a7077..e4ab4918f63d 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c @@ -159,7 +159,7 @@ static inline void f75375_write8(struct i2c_client *client, u8 reg, static inline void f75375_write16(struct i2c_client *client, u8 reg, u16 value) { - int err = i2c_smbus_write_byte_data(client, reg, (value << 8)); + int err = i2c_smbus_write_byte_data(client, reg, (value >> 8)); if (err) return; i2c_smbus_write_byte_data(client, reg + 1, (value & 0xFF)); @@ -311,7 +311,7 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val) fanmode |= (3 << FAN_CTRL_MODE(nr)); break; case 2: /* AUTOMATIC*/ - fanmode |= (2 << FAN_CTRL_MODE(nr)); + fanmode |= (1 << FAN_CTRL_MODE(nr)); break; case 3: /* fan speed */ break; |