diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2022-08-25 21:45:38 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2022-08-25 21:45:38 -0700 |
| commit | ec6624452e36158d0813758d837f7a2263a4109d (patch) | |
| tree | d87a97b450d21edc0fafcfcb1e5b13020249bd60 /drivers/net/ipa/ipa_mem.c | |
| parent | e9ac503883abbd298b77477ccf60412bc0ca742f (diff) | |
| parent | 4c612826bec1441214816827979b62f84a097e91 (diff) | |
| download | linux-stable-ec6624452e36158d0813758d837f7a2263a4109d.tar.gz linux-stable-ec6624452e36158d0813758d837f7a2263a4109d.tar.bz2 linux-stable-ec6624452e36158d0813758d837f7a2263a4109d.zip | |
Merge branch 'linus'
Diffstat (limited to 'drivers/net/ipa/ipa_mem.c')
| -rw-r--r-- | drivers/net/ipa/ipa_mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ipa/ipa_mem.c b/drivers/net/ipa/ipa_mem.c index 1e9eae208e44..53a1dbeaffa6 100644 --- a/drivers/net/ipa/ipa_mem.c +++ b/drivers/net/ipa/ipa_mem.c @@ -568,7 +568,7 @@ static int ipa_smem_init(struct ipa *ipa, u32 item, size_t size) } /* Align the address down and the size up to a page boundary */ - addr = qcom_smem_virt_to_phys(virt) & PAGE_MASK; + addr = qcom_smem_virt_to_phys(virt); phys = addr & PAGE_MASK; size = PAGE_ALIGN(size + addr - phys); iova = phys; /* We just want a direct mapping */ |