diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 09:02:28 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2021-06-30 09:02:28 +0200 |
| commit | 5a94296bc02ac616336da7b5332b86d2ca8827f0 (patch) | |
| tree | d13c4e7db2b4b01adb87fbf2ea5bafd2dc920b2f /drivers/hwmon/corsair-psu.c | |
| parent | 3b770932eefb7c0c6319d332023efee87eb12913 (diff) | |
| parent | 24a31ea94922d391a96a9dd0a9a830de65423817 (diff) | |
| download | lwn-5a94296bc02ac616336da7b5332b86d2ca8827f0.tar.gz lwn-5a94296bc02ac616336da7b5332b86d2ca8827f0.zip | |
Merge branch 'for-5.14/amd-sfh' into for-linus
- support for Renoir and Cezanne SoCs
- support for Ambient Light Sensor
- support for Human Presence Detection sensor
all from Basavaraj Natikar
Diffstat (limited to 'drivers/hwmon/corsair-psu.c')
| -rw-r--r-- | drivers/hwmon/corsair-psu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/corsair-psu.c b/drivers/hwmon/corsair-psu.c index 3a5807e4a2ef..02298b86b57b 100644 --- a/drivers/hwmon/corsair-psu.c +++ b/drivers/hwmon/corsair-psu.c @@ -355,7 +355,7 @@ static umode_t corsairpsu_hwmon_power_is_visible(const struct corsairpsu_data *p return 0444; default: return 0; - }; + } } static umode_t corsairpsu_hwmon_in_is_visible(const struct corsairpsu_data *priv, u32 attr, @@ -376,7 +376,7 @@ static umode_t corsairpsu_hwmon_in_is_visible(const struct corsairpsu_data *priv break; default: break; - }; + } return res; } |