diff options
| author | Sebastian Reichel <sre@kernel.org> | 2021-06-29 22:38:37 +0200 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2021-06-29 22:38:37 +0200 |
| commit | 2fc6d0ec54b9574c02f83ee64f42b77ac141ce90 (patch) | |
| tree | 340554370db7584e9bf5ef72c8cc2c5053e9b384 /drivers/power | |
| parent | power: supply: cpcap-charger: get the battery inserted infomation from cpcap-... (diff) | |
| parent | power: supply: surface-charger: Fix type of integer variable (diff) | |
| download | linux-2fc6d0ec54b9574c02f83ee64f42b77ac141ce90.tar.xz linux-2fc6d0ec54b9574c02f83ee64f42b77ac141ce90.zip | |
Merge branch 'psy-fixes' into psy-next
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/supply/surface_battery.c | 14 | ||||
| -rw-r--r-- | drivers/power/supply/surface_charger.c | 2 |
2 files changed, 13 insertions, 3 deletions
diff --git a/drivers/power/supply/surface_battery.c b/drivers/power/supply/surface_battery.c index 7efa431a62b2..5ec2e6bb2465 100644 --- a/drivers/power/supply/surface_battery.c +++ b/drivers/power/supply/surface_battery.c @@ -345,6 +345,16 @@ static u32 spwr_notify_bat(struct ssam_event_notifier *nf, const struct ssam_eve struct spwr_battery_device *bat = container_of(nf, struct spwr_battery_device, notif); int status; + /* + * We cannot use strict matching when registering the notifier as the + * EC expects us to register it against instance ID 0. Strict matching + * would thus drop events, as those may have non-zero instance IDs in + * this subsystem. So we need to check the instance ID of the event + * here manually. + */ + if (event->instance_id != bat->sdev->uid.instance) + return 0; + dev_dbg(&bat->sdev->dev, "power event (cid = %#04x, iid = %#04x, tid = %#04x)\n", event->command_id, event->instance_id, event->target_id); @@ -720,8 +730,8 @@ static void spwr_battery_init(struct spwr_battery_device *bat, struct ssam_devic bat->notif.base.fn = spwr_notify_bat; bat->notif.event.reg = registry; bat->notif.event.id.target_category = sdev->uid.category; - bat->notif.event.id.instance = 0; - bat->notif.event.mask = SSAM_EVENT_MASK_STRICT; + bat->notif.event.id.instance = 0; /* need to register with instance 0 */ + bat->notif.event.mask = SSAM_EVENT_MASK_TARGET; bat->notif.event.flags = SSAM_EVENT_SEQUENCED; bat->psy_desc.name = bat->name; diff --git a/drivers/power/supply/surface_charger.c b/drivers/power/supply/surface_charger.c index 81a5b79822c9..a060c36c7766 100644 --- a/drivers/power/supply/surface_charger.c +++ b/drivers/power/supply/surface_charger.c @@ -66,7 +66,7 @@ struct spwr_ac_device { static int spwr_ac_update_unlocked(struct spwr_ac_device *ac) { - u32 old = ac->state; + __le32 old = ac->state; int status; lockdep_assert_held(&ac->lock); |