diff options
author | Michael Bestas <mkbestas@lineageos.org> | 2021-03-17 21:19:29 +0200 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2021-03-17 21:19:29 +0200 |
commit | c66c1e4925165243b33081fd609c4a8a7d35e2fc (patch) | |
tree | 4b1ecfa91c8ea48fa6c8b253aec7c2278b22ef6b /drivers | |
parent | 3d9b6f5ee02e712b6cd1d50db3c2e68064fc2eca (diff) | |
parent | 63714bcee868dc8795ffec220bdc452b8c494c98 (diff) |
Merge tag 'LA.UM.9.2.r1-02700-SDMxx0.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4 into lineage-18.1-caf-msm8998
* tag 'LA.UM.9.2.r1-02700-SDMxx0.0' of https://source.codeaurora.org/quic/la/kernel/msm-4.4:
msm: kgsl: Change start variable type to int in kgsl_iommu_add_global
net: ipv6: Use passed in table for nexthop lookups
audit: fix error handling in audit_data_to_entry()
Change-Id: Ib93d4d6be7d09f60590bbcbf3b5d43ecda678bbe
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/msm/kgsl_iommu.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c index 08f5c6d9d50b..98537730cbc9 100644 --- a/drivers/gpu/msm/kgsl_iommu.c +++ b/drivers/gpu/msm/kgsl_iommu.c @@ -199,8 +199,9 @@ static void kgsl_iommu_remove_global(struct kgsl_mmu *mmu, static void kgsl_iommu_add_global(struct kgsl_mmu *mmu, struct kgsl_memdesc *memdesc, const char *name) { - u32 bit, start = 0; + u32 bit; u64 size = kgsl_memdesc_footprint(memdesc); + int start = 0; if (memdesc->gpuaddr != 0) return; |