github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-31 19:47:08 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge "leds: qti-flash:Show MAX_FLASH_CURRENT_MA for no battery use case"

Browse Source
This commit is contained in:
qctecmdr 2022-11-21 10:54:05 -08:00 committed by Gerrit - the friendly Code Review server
commit 1230185c62
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/leds/leds-qti-flash.c
View File

@ -938,6 +938,14 @@ static int qti_flash_led_calc_max_avail_current(
vph_flash_uv, vin_flash_uv, p_flash_fw;
union power_supply_propval prop = {};
if (!led->batt_psy)
led->batt_psy = power_supply_get_by_name("battery");
if (!led->batt_psy) {
*max_current_ma = MAX_FLASH_CURRENT_MA;
return 0;
}
rc = qti_battery_charger_get_prop("battery", BATTERY_RESISTANCE,
&rbatt_uohm);
if (rc < 0) {
@ -951,14 +959,6 @@ static int qti_flash_led_calc_max_avail_current(
return 0;
}
if (!led->batt_psy)
led->batt_psy = power_supply_get_by_name("battery");
if (!led->batt_psy) {
pr_err("Failed to get battery power supply, rc=%d\n", rc);
return -EINVAL;
}
rc = power_supply_get_property(led->batt_psy,
POWER_SUPPLY_PROP_VOLTAGE_OCV, &prop);
if (rc < 0) {