Commit f743106e authored Nov 17, 2017 by Desnes Augusto Nunes do Rosario Committed by David S. Miller Nov 18, 2017

ibmvnic: fix dma_mapping_error call

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: 4e6759be ("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>

parent fe18da60

drivers/net/ethernet/ibm/ibmvnic.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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;