diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-29 16:03:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-29 16:03:45 -0700 |
commit | af3a5fe4ddfe3d426eb025d4c3afd176efea658e (patch) | |
tree | bcc52bb9b029411da0a4b74c9a1a257bb8420758 /include | |
parent | f3f106dac0458e3010486860baba8fdc2a133e5e (diff) | |
parent | d49dbfade96d5b0863ca8a90122a805edd5ef50a (diff) | |
download | linux-af3a5fe4ddfe3d426eb025d4c3afd176efea658e.tar.bz2 |
Merge tag 'hwmon-for-linus-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
- Fix potential Spectre v1 in nct6775
- Add error checking to adt7475 driver
- Fix reading shunt resistor value in ina2xx driver
* tag 'hwmon-for-linus-v4.19-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct6775) Fix potential Spectre v1
hwmon: (adt7475) Make adt7475_read_word() return errors
hwmon: (adt7475) Potential error pointer dereferences
hwmon: (ina2xx) fix sysfs shunt resistor read access
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/platform_data/ina2xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/platform_data/ina2xx.h b/include/linux/platform_data/ina2xx.h index 9abc0ca7259b..9f0aa1b48c78 100644 --- a/include/linux/platform_data/ina2xx.h +++ b/include/linux/platform_data/ina2xx.h @@ -1,7 +1,7 @@ /* * Driver for Texas Instruments INA219, INA226 power monitor chips * - * Copyright (C) 2012 Lothar Felten <l-felten@ti.com> + * Copyright (C) 2012 Lothar Felten <lothar.felten@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as |