diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-27 15:48:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-27 15:48:50 -0700 |
| commit | 95a99fbf300135cd47d4a76736780936c12eda3b (patch) | |
| tree | e68f6be45737dad6a41d59e7faaa4d24697c5b09 /drivers/soc | |
| parent | 3896b5e4d8a36f3915a1f734bf36a12bb71c7ad5 (diff) | |
| parent | a8711e7a856ceb3c2584a3d4936850e4370d7675 (diff) | |
Merge "icnss: Do not parse VBATT DT entry if VBATT feature is disabled"
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/qcom/icnss.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c index 36622e30fbe7..f1d3c7e99a4c 100644 --- a/drivers/soc/qcom/icnss.c +++ b/drivers/soc/qcom/icnss.c @@ -4236,6 +4236,11 @@ static int icnss_get_vbatt_info(struct icnss_priv *priv) struct qpnp_vadc_chip *vadc_dev = NULL; int ret = 0; + if (test_bit(VBATT_DISABLE, &quirks)) { + icnss_pr_dbg("VBATT feature is disabled\n"); + return ret; + } + adc_tm_dev = qpnp_get_adc_tm(&priv->pdev->dev, "icnss"); if (PTR_ERR(adc_tm_dev) == -EPROBE_DEFER) { icnss_pr_err("adc_tm_dev probe defer\n"); |