diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-05-24 02:46:37 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-05-24 02:46:37 -0700 |
| commit | 99f9e4f8bb48916ddae4ef09e27f37ebb40ba164 (patch) | |
| tree | 0e475f6822772bba395f38d44d24d4a494b774e5 | |
| parent | 7b7e229ed21a0939fa7752d672c24f646cdb19cc (diff) | |
| parent | b7c91feb97d98a86227bef7d3840c16ac990d42e (diff) | |
Merge "power: smb-lib: Allow PD enable/disable for typeC devices only"
| -rw-r--r-- | drivers/power/supply/qcom/smb-lib.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/power/supply/qcom/smb-lib.c b/drivers/power/supply/qcom/smb-lib.c index 0ed748b5d582..2cf8eb4e7ceb 100644 --- a/drivers/power/supply/qcom/smb-lib.c +++ b/drivers/power/supply/qcom/smb-lib.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2017 The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2018 The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -3615,7 +3615,8 @@ static void smblib_handle_hvdcp_check_timeout(struct smb_charger *chg, * if pd is not allowed, then set pd_active = false right here, * so that it starts the hvdcp engine */ - if (!get_effective_result(chg->pd_allowed_votable)) + if (!get_effective_result(chg->pd_allowed_votable) && + !chg->micro_usb_mode) __smblib_set_prop_pd_active(chg, 0); } |