From: Logan Gunthorpe <logang@deltatee.com>
To: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org
Cc: Dan Carpenter <dan.carpenter@oracle.com>,
Logan Gunthorpe <logang@deltatee.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Christoph Hellwig <hch@infradead.org>
Subject: [PATCH] PCI/P2PDMA: Fix NULL check in pci_p2pmem_publish()
Date: Wed, 17 Oct 2018 10:05:10 -0600 [thread overview]
Message-ID: <20181017160510.17926-1-logang@deltatee.com> (raw)
We should only assign 'p2pmem_published' if 'pdev->p2pdma' is not NULL.
The extra check on 'publish' makes no sense.
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Christoph Hellwig <hch@infradead.org>
---
drivers/pci/p2pdma.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index da66c7e31730..d710b5ef65a1 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -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);
--
2.19.0
next reply other threads:[~2018-10-17 16:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-17 16:05 Logan Gunthorpe [this message]
2018-10-17 17:19 ` [PATCH] PCI/P2PDMA: Fix NULL check in pci_p2pmem_publish() Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181017160510.17926-1-logang@deltatee.com \
--to=logang@deltatee.com \
--cc=bhelgaas@google.com \
--cc=dan.carpenter@oracle.com \
--cc=hch@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).