diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-13 23:13:03 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-13 23:13:03 -0700 |
| commit | 06a047a77f5aeb552d326f89aa748ea2e68eb309 (patch) | |
| tree | 2e6a8bdcd02abaddfe1cf3d32455b37e441e5123 | |
| parent | d43110ab63411fa3ac53e92d4f646842149f185a (diff) | |
| parent | d59d29962505c4ece248e95281bf1631b7887b07 (diff) | |
Merge "qcom-charger: qpnp-fg-gen3: remove wakelock when reading SRAM props"
| -rw-r--r-- | drivers/power/qcom-charger/fg-core.h | 1 | ||||
| -rw-r--r-- | drivers/power/qcom-charger/qpnp-fg-gen3.c | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/drivers/power/qcom-charger/fg-core.h b/drivers/power/qcom-charger/fg-core.h index cf7869ea1515..ef4ea8172035 100644 --- a/drivers/power/qcom-charger/fg-core.h +++ b/drivers/power/qcom-charger/fg-core.h @@ -40,7 +40,6 @@ #define SRAM_READ "fg_sram_read" #define SRAM_WRITE "fg_sram_write" -#define SRAM_UPDATE "fg_sram_update" #define PROFILE_LOAD "fg_profile_load" #define DELTA_SOC "fg_delta_soc" diff --git a/drivers/power/qcom-charger/qpnp-fg-gen3.c b/drivers/power/qcom-charger/qpnp-fg-gen3.c index 2adc07ddc5a0..b350e53237b7 100644 --- a/drivers/power/qcom-charger/qpnp-fg-gen3.c +++ b/drivers/power/qcom-charger/qpnp-fg-gen3.c @@ -413,13 +413,12 @@ static int fg_get_sram_prop(struct fg_chip *chip, enum fg_sram_param_id id, if (id < 0 || id > FG_SRAM_MAX || chip->sp[id].len > sizeof(buf)) return -EINVAL; - vote(chip->awake_votable, SRAM_UPDATE, true, 0); rc = fg_sram_read(chip, chip->sp[id].address, chip->sp[id].offset, buf, chip->sp[id].len, FG_IMA_DEFAULT); if (rc < 0) { pr_err("Error reading address 0x%04x[%d] rc=%d\n", chip->sp[id].address, chip->sp[id].offset, rc); - goto out; + return rc; } for (i = 0, temp = 0; i < chip->sp[id].len; i++) @@ -427,9 +426,6 @@ static int fg_get_sram_prop(struct fg_chip *chip, enum fg_sram_param_id id, *val = fg_decode(chip->sp, id, temp); return 0; -out: - vote(chip->awake_votable, SRAM_UPDATE, false, 0); - return rc; } #define BATT_TEMP_NUMR 1 |