Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit fdafa7cf97a3c4c1d731600b94241cb9cea40fc8

Authored by Linus Torvalds
2 parents 79a6fb1ace 93d783bcca
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull hwmon fix from Guenter Roeck:
 "Fix bug in adt7470 driver which causes it to fail writing fan speed
  limits"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (adt7470) Fix incorrect return code check

Showing 1 changed file Side-by-side Diff

drivers/hwmon/adt7470.c
Diff comments   View file @ fdafa7c
... ... @@ -215,7 +215,7 @@
215 215 u16 value)
216 216 {
217 217 return i2c_smbus_write_byte_data(client, reg, value & 0xFF)
218   - && i2c_smbus_write_byte_data(client, reg + 1, value >> 8);
  218 + || i2c_smbus_write_byte_data(client, reg + 1, value >> 8);
219 219 }
220 220  
221 221 static void adt7470_init_client(struct i2c_client *client)