Skip to contentSkip to conversation

PCI/P2PDMA: Fix NULL check in pci_p2pmem_publish()

PATCH In review Logan Gunthorpe 2 participants 2 messages Oct 17, 2018

Subsystems (2)
lore
Share & tools
lore

Logan Gunthorpe

author maintainer
#0 lore raw

PATCH 1/1 PCI/P2PDMA: Fix NULL check in pci_p2pmem_publish()

We should only assign 'p2pmem_published' if 'pdev->p2pdma' is not NULL. The extra check on 'publish' makes no sense.

---
 drivers/pci/p2pdma.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/p2pdma.c +2 -4
index da66c7e31730..d710b5ef65a1 100644
@@ -678,10 +678,8 @@ EXPORT_SYMBOL_GPL(pci_p2pmem_free_sgl);
  */
 void pci_p2pmem_publish(struct pci_dev *pdev, bool publish)
 {
-	if (publish && !pdev->p2pdma)
-		return;
-
-	pdev->p2pdma->p2pmem_published = publish;
+	if (pdev->p2pdma)
+		pdev->p2pdma->p2pmem_published = publish;
 }
 EXPORT_SYMBOL_GPL(pci_p2pmem_publish);
 
Signature · 1 line
2.19.0
#1 lore raw
Quoted 7 lines · Logan Gunthorpe

We should only assign 'p2pmem_published' if 'pdev->p2pdma' is not NULL. The extra check on 'publish' makes no sense.

I folded this into the original commit on pci/peer-to-peer, thanks!

Quoted 24 lines
---
 drivers/pci/p2pdma.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/p2pdma.c +2 -4
index da66c7e31730..d710b5ef65a1 100644
@@ -678,10 +678,8 @@ EXPORT_SYMBOL_GPL(pci_p2pmem_free_sgl);
  */
 void pci_p2pmem_publish(struct pci_dev *pdev, bool publish)
 {
-	if (publish && !pdev->p2pdma)
-		return;
-
-	pdev->p2pdma->p2pmem_published = publish;
+	if (pdev->p2pdma)
+		pdev->p2pdma->p2pmem_published = publish;
 }
 EXPORT_SYMBOL_GPL(pci_p2pmem_publish);
 
Signature · 1 line
2.19.0