diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-22 13:18:41 -0600 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2016-10-22 13:18:41 -0600 |
| commit | f4b294b654d1605abdfde5e6e3cfc17a5e2f355b (patch) | |
| tree | 9a3891cf8f501097180b1ef612ceb7ff05db5656 | |
| parent | 3bc48e6ff186a1cda9b62b16ef60c7ca0568ca68 (diff) | |
| parent | 3320f03611573a955335d21df736b48412c8f902 (diff) | |
Promotion of kernel.lnx.4.4-161022.1.
CRs Change ID Subject
--------------------------------------------------------------------------------------------------------------
1079471 I1b9117edb6c2206c09deb083529479a3ccc4618d qpnp-fg-gen3: update the FCC unit while notifying charge
1075869 I33e8e859e99d4f7c4616aeee1da8214497e30625 iommu: arm-smmu: Fix a possible null pointer dereference
Change-Id: I570b50404fb3e269ee641727c5b8c64dc4dde4e7
CRs-Fixed: 1075869, 1079471
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 2 | ||||
| -rw-r--r-- | drivers/power/qcom-charger/qpnp-fg-gen3.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index afa519aa8203..702706ae60f7 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2938,7 +2938,7 @@ static struct iommu_group *arm_smmu_device_group(struct device *dev) */ group = generic_device_group(dev); - if (IS_ERR(group)) + if (IS_ERR_OR_NULL(group)) return group; if (dev_is_pci(dev)) diff --git a/drivers/power/qcom-charger/qpnp-fg-gen3.c b/drivers/power/qcom-charger/qpnp-fg-gen3.c index c0a19ae115d0..c0e4e533cab9 100644 --- a/drivers/power/qcom-charger/qpnp-fg-gen3.c +++ b/drivers/power/qcom-charger/qpnp-fg-gen3.c @@ -1663,7 +1663,7 @@ static void fg_notify_charger(struct fg_chip *chip) return; } - prop.intval = chip->bp.fastchg_curr_ma; + prop.intval = chip->bp.fastchg_curr_ma * 1000; rc = power_supply_set_property(chip->batt_psy, POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (rc < 0) { |