fix(battery): prevent bus fault when battery does not exist #2099
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zmk_battery_start_reporting() may be called from battery_event_listener(), which will result in a bus fault when attempting to read a battery that does not exist such as on a dongle.
petejohanson
reviewed
Jan 6, 2024
| @@ -87,7 +87,9 @@ static void zmk_battery_timer(struct k_timer *timer) { | |||
| K_TIMER_DEFINE(battery_timer, zmk_battery_timer, NULL); | |||
|
|
|||
| static void zmk_battery_start_reporting() { | |||
| k_timer_start(&battery_timer, K_NO_WAIT, K_SECONDS(CONFIG_ZMK_BATTERY_REPORT_INTERVAL)); | |||
| if (device_is_ready(battery)) { | |||
There was a problem hiding this comment.
Seems reasonable, although I'm surprised that startup even succeeds when the init function below this fails with an error code using this same check.
There was a problem hiding this comment.
I believe the early return in the init function prevents zmk_battery_start_reporting() from being called on startup.
Also Zephyr doesn't actually handle the SYS_INIT() return values.
petejohanson
approved these changes
Jan 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
zmk_battery_start_reporting() may be called from battery_event_listener(), which will result in a bus fault when attempting to read a battery that does not exist such as on a dongle.