diff options
| author | Sebastian Reichel <sebastian.reichel@collabora.com> | 2023-10-21 01:55:43 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sebastian.reichel@collabora.com> | 2023-10-21 01:55:43 +0300 |
| commit | e186bd1ac2f984f525b319924cfb0e197051ba47 (patch) | |
| tree | 2b78957a7ef7a98ea6664f067c5906784567648e /drivers/power/supply/ucs1002_power.c | |
| parent | afc88dfda013970bb1e214b331e99adca2f98312 (diff) | |
| parent | 8894b432548851f705f72ff135d3dcbd442a18d1 (diff) | |
| download | linux-e186bd1ac2f984f525b319924cfb0e197051ba47.tar.xz | |
Merge power-supply fixes for 6.6 cycle
Merge power-supply fixes for the 6.6 cycle, so that changes
to the vexpress driver apply cleanly.
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Diffstat (limited to 'drivers/power/supply/ucs1002_power.c')
| -rw-r--r-- | drivers/power/supply/ucs1002_power.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/power/supply/ucs1002_power.c b/drivers/power/supply/ucs1002_power.c index 954feba6600b..7970843a4f48 100644 --- a/drivers/power/supply/ucs1002_power.c +++ b/drivers/power/supply/ucs1002_power.c @@ -384,7 +384,8 @@ static int ucs1002_get_property(struct power_supply *psy, case POWER_SUPPLY_PROP_USB_TYPE: return ucs1002_get_usb_type(info, val); case POWER_SUPPLY_PROP_HEALTH: - return val->intval = info->health; + val->intval = info->health; + return 0; case POWER_SUPPLY_PROP_PRESENT: val->intval = info->present; return 0; |