projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
714c19b
)
net: ipa: pass correct dma_handle to dma_free_coherent()
author
Dan Carpenter
<dan.carpenter@oracle.com>
Tue, 2 Feb 2021 05:55:25 +0000
(08:55 +0300)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 10 Feb 2021 08:29:15 +0000
(09:29 +0100)
[ Upstream commit
4ace7a6e287b7e3b33276cd9fe870c326f880480
]
The "ring->addr = addr;" assignment is done a few lines later so we
can't use "ring->addr" yet. The correct dma_handle is "addr".
Fixes: 650d1603825d ("soc: qcom: ipa: the generic software interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Alex Elder <elder@linaro.org>
Link:
https://lore.kernel.org/r/YBjpTU2oejkNIULT@mwanda
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ipa/gsi.c
patch
|
blob
|
history
diff --git
a/drivers/net/ipa/gsi.c
b/drivers/net/ipa/gsi.c
index 6bfac1efe037cac26b54337f9017fc1ee075de77..4a68da7115d198d21d3833c378ff757ad7562146 100644
(file)
--- a/
drivers/net/ipa/gsi.c
+++ b/
drivers/net/ipa/gsi.c
@@
-1256,7
+1256,7
@@
static int gsi_ring_alloc(struct gsi *gsi, struct gsi_ring *ring, u32 count)
/* Hardware requires a 2^n ring size, with alignment equal to size */
ring->virt = dma_alloc_coherent(dev, size, &addr, GFP_KERNEL);
if (ring->virt && addr % size) {
- dma_free_coherent(dev, size, ring->virt,
ring->
addr);
+ dma_free_coherent(dev, size, ring->virt, addr);
dev_err(dev, "unable to alloc 0x%zx-aligned ring buffer\n",
size);
return -EINVAL; /* Not a good error value, but distinct */