On Wed, Oct 17, 2018 at 10:05:10AM -0600, Logan Gunthorpe wrote:
> 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 <[email protected]>
> Reported-by: Dan Carpenter <[email protected]>
> Cc: Bjorn Helgaas <[email protected]>
> Cc: Christoph Hellwig <[email protected]>
I folded this into the original commit on pci/peer-to-peer, thanks!
> ---
> 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
>
