Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40572884 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "power: bq28400: update batt_psy.name to avoid conflict"

parents 179c0775 be88a07a

drivers/power/bq28400_battery.c

+2 −2
Original line number Diff line number Diff line
@@ -794,8 +794,8 @@ static int bq28400_register_psy(struct bq28400_device *bq28400_dev) 
{

	int ret;



	bq28400_dev->batt_psy.name = "battery";

	bq28400_dev->batt_psy.type = POWER_SUPPLY_TYPE_BATTERY;

	bq28400_dev->batt_psy.name = "bq28400_battery";

	bq28400_dev->batt_psy.type = POWER_SUPPLY_TYPE_BMS;

	bq28400_dev->batt_psy.num_supplicants = 0;

	bq28400_dev->batt_psy.properties = pm_power_props;

	bq28400_dev->batt_psy.num_properties = ARRAY_SIZE(pm_power_props);