projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1402dc
)
drivers/rapidio/devices/rio_mport_cdev.c: fix error handling in 'rio_dma_transfer()'
author
Christophe JAILLET
<
[email protected]
>
Fri, 17 Nov 2017 23:38:03 +0000
(15:38 -0800)
committer
Linus Torvalds
<
[email protected]
>
Sat, 18 Nov 2017 00:10:03 +0000
(16:10 -0800)
In case of error, 'dma_map_sg()' returns 0, not a negative value. There
is BUG_ON() in 'dma_map_sg_attrs()' which makes sure of that.
Link:
http://lkml.kernel.org/r/d4235bd2b9274e99f6c86ea71b1fa1c7bd8d0c08.1505687047.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Christophe JAILLET <
[email protected]
>
Reviewed-by: Logan Gunthorpe <
[email protected]
>
Cc: Matt Porter <
[email protected]
>
Cc: Alexandre Bounine <
[email protected]
>
Cc: Lorenzo Stoakes <
[email protected]
>
Cc: Jesper Nilsson <
[email protected]
>
Cc: Christian K_nig <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/rapidio/devices/rio_mport_cdev.c
patch
|
blob
|
history
diff --git
a/drivers/rapidio/devices/rio_mport_cdev.c
b/drivers/rapidio/devices/rio_mport_cdev.c
index 86805747a422991dd12f91f3479c0f935e5686d7..dc5a33f936892ed32f29873d615995e505c53ed9 100644
(file)
--- a/
drivers/rapidio/devices/rio_mport_cdev.c
+++ b/
drivers/rapidio/devices/rio_mport_cdev.c
@@
-961,7
+961,7
@@
rio_dma_transfer(struct file *filp, u32 transfer_mode,
nents = dma_map_sg(chan->device->dev,
req->sgt.sgl, req->sgt.nents, dir);
- if (nents ==
-EFAULT
) {
+ if (nents ==
0
) {
rmcd_error("Failed to map SG list");
ret = -EFAULT;
goto err_pg;