Re: [patch] i2c: xgene-slimpro: dma_mapping_error() doesn't return an error code

[Wolfram Sang]

On Tue, Aug 18, 2015 at 12:12:19PM +0300, Dan Carpenter wrote:
 The dma_mapping_error() function returns true if there is an error, it
 doesn't return an error code.  We should return -ENOMEM.
 
 Signed-off-by: Dan Carpenter dan.carpen...@oracle.com

Applied to for-next, thanks!



signature.asc
Description: Digital signature

[patch] i2c: xgene-slimpro: dma_mapping_error() doesn't return an error code

[Dan Carpenter]

The dma_mapping_error() function returns true if there is an error, it
doesn't return an error code.  We should return -ENOMEM.

Signed-off-by: Dan Carpenter dan.carpen...@oracle.com

diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c 
b/drivers/i2c/busses/i2c-xgene-slimpro.c
index 1c9cb65a..4233f56 100644
--- a/drivers/i2c/busses/i2c-xgene-slimpro.c
+++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
@@ -198,10 +198,10 @@ static int slimpro_i2c_blkrd(struct slimpro_i2c_dev *ctx, 
u32 chip, u32 addr,
int rc;
 
paddr = dma_map_single(ctx-dev, ctx-dma_buffer, readlen, 
DMA_FROM_DEVICE);
-   rc = dma_mapping_error(ctx-dev, paddr);
-   if (rc) {
+   if (dma_mapping_error(ctx-dev, paddr)) {
dev_err(ctx-adapter.dev, Error in mapping dma buffer %p\n,
ctx-dma_buffer);
+   rc = -ENOMEM;
goto err;
}
 
@@ -241,10 +241,10 @@ static int slimpro_i2c_blkwr(struct slimpro_i2c_dev *ctx, 
u32 chip,
memcpy(ctx-dma_buffer, data, writelen);
paddr = dma_map_single(ctx-dev, ctx-dma_buffer, writelen,
   DMA_TO_DEVICE);
-   rc = dma_mapping_error(ctx-dev, paddr);
-   if (rc) {
+   if (dma_mapping_error(ctx-dev, paddr)) {
dev_err(ctx-adapter.dev, Error in mapping dma buffer %p\n,
ctx-dma_buffer);
+   rc = -ENOMEM;
goto err;
}
 
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [patch] i2c: xgene-slimpro: dma_mapping_error() doesn't return an error code

[Axel Lin]

2015-08-18 17:12 GMT+08:00 Dan Carpenter dan.carpen...@oracle.com:
 The dma_mapping_error() function returns true if there is an error, it
 doesn't return an error code.  We should return -ENOMEM.

 Signed-off-by: Dan Carpenter dan.carpen...@oracle.com
Reviewed-by: Axel Lin axel@ingics.com
--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html