diff options
author | Desnes Augusto Nunes do Rosario <desnesn@linux.vnet.ibm.com> | 2017-11-17 06:09:04 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-11-17 20:37:00 -0500 |
commit | f743106ec140589b45ecc6ff92bacf48a0e26b05 (patch) | |
tree | e22d27d6e495b6932eb315962828e6b63510948c /drivers/net/ethernet/ibm/ibmvnic.c | |
parent | fe18da60500b8b8aa2621fb1de7132cb1f0aebcf (diff) |
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: 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>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
-rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 3 |
1 files changed, 1 insertions, 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) | |||
849 | { | 849 | { |
850 | struct device *dev = &adapter->vdev->dev; | 850 | struct device *dev = &adapter->vdev->dev; |
851 | union ibmvnic_crq crq; | 851 | union ibmvnic_crq crq; |
852 | dma_addr_t dma_addr; | ||
853 | int len = 0; | 852 | int len = 0; |
854 | 853 | ||
855 | if (adapter->vpd->buff) | 854 | if (adapter->vpd->buff) |
@@ -879,7 +878,7 @@ static int ibmvnic_get_vpd(struct ibmvnic_adapter *adapter) | |||
879 | adapter->vpd->dma_addr = | 878 | adapter->vpd->dma_addr = |
880 | dma_map_single(dev, adapter->vpd->buff, adapter->vpd->len, | 879 | dma_map_single(dev, adapter->vpd->buff, adapter->vpd->len, |
881 | DMA_FROM_DEVICE); | 880 | DMA_FROM_DEVICE); |
882 | if (dma_mapping_error(dev, dma_addr)) { | 881 | if (dma_mapping_error(dev, adapter->vpd->dma_addr)) { |
883 | dev_err(dev, "Could not map VPD buffer\n"); | 882 | dev_err(dev, "Could not map VPD buffer\n"); |
884 | kfree(adapter->vpd->buff); | 883 | kfree(adapter->vpd->buff); |
885 | return -ENOMEM; | 884 | return -ENOMEM; |