diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-03 17:39:27 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-03 17:39:27 -0800 |
| commit | a7554a335c047b0f4045cd2dc6f6e02e02759f8f (patch) | |
| tree | 1894eee4cb3fdb62cc5893453aebc85e52048701 | |
| parent | ea9c12138d1058cc5130cd5bf16d403b5ff761c9 (diff) | |
| parent | 9ce8217d4f2f818d79ab9956d393a061f43461c7 (diff) | |
Merge "power: fg-util: Fix the address mask for secure_write check"
| -rw-r--r-- | drivers/power/supply/qcom/fg-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/qcom/fg-util.c b/drivers/power/supply/qcom/fg-util.c index d5c4f8ffaac3..f2395b6ba4ab 100644 --- a/drivers/power/supply/qcom/fg-util.c +++ b/drivers/power/supply/qcom/fg-util.c @@ -358,7 +358,7 @@ int fg_write(struct fg_chip *chip, int addr, u8 *val, int len) return -ENXIO; mutex_lock(&chip->bus_lock); - sec_access = (addr & 0xFF00) > 0xD0; + sec_access = (addr & 0x00FF) > 0xD0; if (sec_access) { rc = regmap_write(chip->regmap, (addr & 0xFF00) | 0xD0, 0xA5); if (rc < 0) { @@ -398,7 +398,7 @@ int fg_masked_write(struct fg_chip *chip, int addr, u8 mask, u8 val) return -ENXIO; mutex_lock(&chip->bus_lock); - sec_access = (addr & 0xFF00) > 0xD0; + sec_access = (addr & 0x00FF) > 0xD0; if (sec_access) { rc = regmap_write(chip->regmap, (addr & 0xFF00) | 0xD0, 0xA5); if (rc < 0) { |