Commit a9e0c3b0 authored by Will McVicker's avatar Will McVicker Committed by William McVicker
Browse files

ANDROID: arm64: Fix merge issue with __dma_map_area 



The LTS merge conflict was not handled properly for the upstream commit
c50f11c6 ("arm64: mm: Don't invalidate FROM_DEVICE buffers at start
of DMA transfer") which led to device corruption. Fix __dma_map_area()
to include the initial add.

Fixes: 8d0a39b4 ("Merge 5.10.125 into android13-5.10-lts")
Signed-off-by: default avatarWill McVicker <willmcvicker@google.com>
Change-Id: I16de2aa4c58e2984b4436f7ea55b4302b9882827
parent 629d390e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment