[PATCH 4.2 117/134] i2c: xgene-slimpro: dma_mapping_error() doesnt return an error code

[Greg Kroah-Hartman]

4.2-stable review patch.  If anyone has any objections, please let me know.

--

From: Dan Carpenter 

commit a4a9a8cb3248b3b48a6049acaeaf23d4ad3712b9 upstream.

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 
Reviewed-by: Axel Lin 
Signed-off-by: Wolfram Sang 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/i2c/busses/i2c-xgene-slimpro.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

--- 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 slim
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(>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 slim
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(>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-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 4.2 117/134] i2c: xgene-slimpro: dma_mapping_error() doesnt return an error code

[Greg Kroah-Hartman]

4.2-stable review patch.  If anyone has any objections, please let me know.

--

From: Dan Carpenter 

commit a4a9a8cb3248b3b48a6049acaeaf23d4ad3712b9 upstream.

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 
Reviewed-by: Axel Lin 
Signed-off-by: Wolfram Sang 
Signed-off-by: Greg Kroah-Hartman 

---
 drivers/i2c/busses/i2c-xgene-slimpro.c |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

--- 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 slim
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(>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 slim
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(>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-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/