From f743106ec140589b45ecc6ff92bacf48a0e26b05 Mon Sep 17 00:00:00 2001

From: Desnes Augusto Nunes do Rosario <desnesn@linux.vnet.ibm.com>

Date: Fri, 17 Nov 2017 09:09:04 -0200

Subject: [PATCH] ibmvnic: fix dma_mapping_error call

References: bsc#1069942

Patch-mainline: v4.15-rc1

Git-commit: f743106ec140589b45ecc6ff92bacf48a0e26b05

This patch fixes the dma_mapping_error call to use the correct dma_addr

which is inside the ibmvnic_vpd struct. Moreover, it fixes an uninitialized

warning regarding a local dma_addr variable which is not used anymore.

Fixes: 4e6759be28e4 ("ibmvnic: Feature implementation of VPD for the ibmvnic driver")

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

Signed-off-by: Desnes A. Nunes do Rosario <desnesn@linux.vnet.ibm.com>

Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Michal Suchanek <msuchanek@suse.de>

---

 drivers/net/ethernet/ibm/ibmvnic.c | 3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c

index 04aaacbc3d45..1dc4aef37d3a 100644

--- a/drivers/net/ethernet/ibm/ibmvnic.c

+++ b/drivers/net/ethernet/ibm/ibmvnic.c

@@ -849,7 +849,6 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter)

 {

 	struct device *dev = &adapter->vdev->dev;

 	union ibmvnic_crq crq;

-	dma_addr_t dma_addr;

 	int len = 0;

 	if (adapter->vpd->buff)

@@ -879,7 +878,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter)

 	adapter->vpd->dma_addr =

 		dma_map_single(dev, adapter->vpd->buff, adapter->vpd->len,

 			       DMA_FROM_DEVICE);

-	if (dma_mapping_error(dev, dma_addr)) {

+	if (dma_mapping_error(dev, adapter->vpd->dma_addr)) {

 		dev_err(dev, "Could not map VPD buffer\n");

 		kfree(adapter->vpd->buff);

 		return -ENOMEM;

-- 

2.13.6