diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2016-11-25 06:01:32 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-12-11 21:15:48 -0500 |
commit | efca4885b5dea6af906d27b3516f68e0bc1ff9c3 (patch) | |
tree | e160e8a90a7b8fc8c4edb22cb57029eeedeff72e /arch/sparc | |
parent | b1ebb975507d07d3ce84695273acc872786194da (diff) |
sparc64: move dereference after check for NULL
We shouldn't dereference "iommu" until after we have checked that it is
non-NULL.
Fixes: f08978b0fdbf ("sparc64: Enable sun4v dma ops to use IOMMU v2 APIs")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/pci_sun4v.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sparc/kernel/pci_sun4v.c b/arch/sparc/kernel/pci_sun4v.c index 06981cc716b6..cabb609fedcc 100644 --- a/arch/sparc/kernel/pci_sun4v.c +++ b/arch/sparc/kernel/pci_sun4v.c | |||
@@ -478,11 +478,10 @@ static int dma_4v_map_sg(struct device *dev, struct scatterlist *sglist, | |||
478 | BUG_ON(direction == DMA_NONE); | 478 | BUG_ON(direction == DMA_NONE); |
479 | 479 | ||
480 | iommu = dev->archdata.iommu; | 480 | iommu = dev->archdata.iommu; |
481 | atu = iommu->atu; | ||
482 | |||
483 | if (nelems == 0 || !iommu) | 481 | if (nelems == 0 || !iommu) |
484 | return 0; | 482 | return 0; |
485 | 483 | atu = iommu->atu; | |
484 | |||
486 | prot = HV_PCI_MAP_ATTR_READ; | 485 | prot = HV_PCI_MAP_ATTR_READ; |
487 | if (direction != DMA_TO_DEVICE) | 486 | if (direction != DMA_TO_DEVICE) |
488 | prot |= HV_PCI_MAP_ATTR_WRITE; | 487 | prot |= HV_PCI_MAP_ATTR_WRITE; |