Skip to contentSkip to conversation

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

PATCH Applied Dan Carpenter 3 participants 3 messages Aug 18, 2015 – Aug 24, 2015

Subsystems (2)
Kernel janitors I2C subsystem host drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 i2c: xgene-slimpro: dma_mapping_error() doesn't return an error code

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 <[email protected]>
drivers/i2c/busses/i2c-xgene-slimpro.c +4 -4
index 1c9cb65a..4233f56 100644
@@ -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;
 	}