| Message ID | 20171116182809.21733-1-desnesn@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [net-next] ibmvnic: This patch fixes the dma_mapping_error call to use the correct dma_addr which is inside the ibmvnic_vpd struct. | expand |
Version 2 of this patch has been already sent with correct styling. On 11/16/2017 04:28 PM, Desnes Augusto Nunes do Rosario wrote: > Signed-off-by: Desnes A. Nunes do Rosario <desnesn@linux.vnet.ibm.com> > --- > 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 04aaacb..1dc4aef 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; >
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 04aaacb..1dc4aef 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;
Signed-off-by: Desnes A. Nunes do Rosario <desnesn@linux.vnet.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)