Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4b294b6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

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
parents 3bc48e6f 3320f036

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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))

drivers/power/qcom-charger/qpnp-fg-gen3.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {