Merge branch 'hx20-hx30' of github.com:FrameworkComputer/EmbeddedController into hx20-hx30

kiram9 · kiram9 · commit f6d6b927eed7 · 2023-05-26T00:03:59.000-07:00
diff --git a/baseboard/fwk/battery.c b/baseboard/fwk/battery.c
@@ -476,8 +476,7 @@ static enum ec_status cmd_charging_limit_control(struct host_cmd_handler_args *a
 		charging_maximum_level = charging_maximum_level | CHG_LIMIT_OVERRIDE;
 
 	if (p->modes & CHG_LIMIT_GET_LIMIT) {
-		system_get_bbram(SYSTEM_BBRAM_IDX_CHG_MAX, &charging_maximum_level);
-		r->max_percentage = charging_maximum_level;
+		system_get_bbram(SYSTEM_BBRAM_IDX_CHG_MAX, &r->max_percentage);
 		args->response_size = sizeof(*r);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -476,8 +476,7 @@ static enum ec_status cmd_charging_limit_control(struct host_cmd_handler_args *a`
`476`	`476`	`charging_maximum_level = charging_maximum_level \| CHG_LIMIT_OVERRIDE;`
`477`	`477`
`478`	`478`	`if (p->modes & CHG_LIMIT_GET_LIMIT) {`
`479`		`- system_get_bbram(SYSTEM_BBRAM_IDX_CHG_MAX, &charging_maximum_level);`
`480`		`- r->max_percentage = charging_maximum_level;`
	`479`	`+ system_get_bbram(SYSTEM_BBRAM_IDX_CHG_MAX, &r->max_percentage);`
`481`	`480`	`args->response_size = sizeof(*r);`
`482`	`481`	`}`
`483`	`482`