From a53c420c5dbb5db65a031378bd9041c24f343836 Mon Sep 17 00:00:00 2001 From: Subbaraman Narayanamurthy Date: Thu, 20 Oct 2016 12:04:02 -0700 Subject: qpnp-fg-gen3: update the FCC unit while notifying charger Charger driver expects the constant_charge_current_max property in microunits. Update it. Change-Id: I1b9117edb6c2206c09deb083529479a3ccc4618d Signed-off-by: Subbaraman Narayanamurthy --- drivers/power/qcom-charger/qpnp-fg-gen3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.3 From 98de7b7b6684639a4af13718e4159428987ecf33 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Thu, 20 Oct 2016 13:20:15 -0700 Subject: iommu: arm-smmu: Fix a possible null pointer dereference Reported by static analysis tools. generic_device_group() may return NULL on an error case. Change-Id: I33e8e859e99d4f7c4616aeee1da8214497e30625 Signed-off-by: Patrick Daly --- drivers/iommu/arm-smmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index c69927bd4ff2..ba7d7c9e0421 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -2949,7 +2949,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)) -- cgit v1.2.3