diff options
| author | Scott Wood | 2019-05-09 23:08:27 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-06-25 05:35:55 +0200 |
| commit | 505de32ea95209c2b587bb91b87e460bc59221ff (patch) | |
| tree | 6c794e786ce429e1b57be7bd0c3d91f9b343cd68 | |
| parent | ARC: [plat-hsdk]: Add missing FIFO size entry in GMAC node (diff) | |
| download | kernel-qcow2-linux-505de32ea95209c2b587bb91b87e460bc59221ff.tar.gz kernel-qcow2-linux-505de32ea95209c2b587bb91b87e460bc59221ff.tar.xz kernel-qcow2-linux-505de32ea95209c2b587bb91b87e460bc59221ff.zip | |
fpga: dfl: afu: Pass the correct device to dma_mapping_error()
[ Upstream commit 13069847a475b60069918dc9971f5adb42811ce3 ]
dma_mapping_error() was being called on a different device struct than
what was passed to map/unmap. Besides rendering the error checking
ineffective, it caused a debug splat with CONFIG_DMA_API_DEBUG.
Signed-off-by: Scott Wood <swood@redhat.com>
Acked-by: Wu Hao <hao.wu@intel.com>
Acked-by: Moritz Fischer <mdf@kernel.org>
Acked-by: Alan Tull <atull@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/fpga/dfl-afu-dma-region.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl-afu-dma-region.c index 0e81d33af856..c9a613dc9eb7 100644 --- a/drivers/fpga/dfl-afu-dma-region.c +++ b/drivers/fpga/dfl-afu-dma-region.c @@ -399,7 +399,7 @@ int afu_dma_map_region(struct dfl_feature_platform_data *pdata, region->pages[0], 0, region->length, DMA_BIDIRECTIONAL); - if (dma_mapping_error(&pdata->dev->dev, region->iova)) { + if (dma_mapping_error(dfl_fpga_pdata_to_parent(pdata), region->iova)) { dev_err(&pdata->dev->dev, "failed to map for dma\n"); ret = -EFAULT; goto unpin_pages; |