Commit c46d90cd authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Linus Torvalds

drivers/rapidio/devices/rio_mport_cdev.c: fix error handling in 'rio_dma_transfer()'

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.frSigned-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Lorenzo Stoakes <lstoakes@gmail.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Christian K_nig <christian.koenig@amd.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1402dcb
...@@ -961,7 +961,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode, ...@@ -961,7 +961,7 @@ rio_dma_transfer(struct file *filp, u32 transfer_mode,
nents = dma_map_sg(chan->device->dev, nents = dma_map_sg(chan->device->dev,
req->sgt.sgl, req->sgt.nents, dir); req->sgt.sgl, req->sgt.nents, dir);
if (nents == -EFAULT) { if (nents == 0) {
rmcd_error("Failed to map SG list"); rmcd_error("Failed to map SG list");
ret = -EFAULT; ret = -EFAULT;
goto err_pg; goto err_pg;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment