diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-25 17:46:56 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-25 17:46:56 -0800 |
| commit | 2d8b206407fef7d31bbd657d83fc8d08f858edac (patch) | |
| tree | 38d27f9656363e64f1cd462f2ccbd6fe62bdef7a | |
| parent | c7690d69011bef8005faf328887bfa1e5e9f5cb9 (diff) | |
| parent | 19679fef1dea7593ca8b12b874282669b9c12ac0 (diff) | |
Merge "smb-lib: fix null ptr access while handling src change interrupt"
| -rw-r--r-- | drivers/power/qcom-charger/smb-lib.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/power/qcom-charger/smb-lib.c b/drivers/power/qcom-charger/smb-lib.c index 3403474565be..52805357ef92 100644 --- a/drivers/power/qcom-charger/smb-lib.c +++ b/drivers/power/qcom-charger/smb-lib.c @@ -505,15 +505,14 @@ static int try_rerun_apsd_for_hvdcp(struct smb_charger *chg) static const struct apsd_result *smblib_update_usb_type(struct smb_charger *chg) { - const struct apsd_result *apsd_result; + const struct apsd_result *apsd_result = smblib_get_apsd_result(chg); /* if PD is active, APSD is disabled so won't have a valid result */ if (chg->pd_active) { chg->usb_psy_desc.type = POWER_SUPPLY_TYPE_USB_PD; - return 0; + return apsd_result; } - apsd_result = smblib_get_apsd_result(chg); chg->usb_psy_desc.type = apsd_result->pst; return apsd_result; } |