Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9716bdb2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pci-v4.13-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci 

Pull PCI fix from Bjorn Helgaas:
 "Remove needlessly alarming MSI affinity warning (this is not actually
  a bug fix, but the warning prompts unnecessary bug reports)"

* tag 'pci-v4.13-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL
parents c153e621 8e1101d2

drivers/pci/msi.c

+3 −10
Original line number Diff line number Diff line
@@ -538,12 +538,9 @@ msi_setup_entry(struct pci_dev *dev, int nvec, const struct irq_affinity *affd) 
	struct msi_desc *entry;

	u16 control;



	if (affd) {

	if (affd)

		masks = irq_create_affinity_masks(nvec, affd);

		if (!masks)

			dev_err(&dev->dev, "can't allocate MSI affinity masks for %d vectors\n",

				nvec);

	}





	/* MSI Entry Initialization */

	entry = alloc_msi_entry(&dev->dev, nvec, masks);
@@ -679,12 +676,8 @@ static int msix_setup_entries(struct pci_dev *dev, void __iomem *base, 
	struct msi_desc *entry;

	int ret, i;



	if (affd) {

	if (affd)

		masks = irq_create_affinity_masks(nvec, affd);

		if (!masks)

			dev_err(&dev->dev, "can't allocate MSI-X affinity masks for %d vectors\n",

				nvec);

	}



	for (i = 0, curmsk = masks; i < nvec; i++) {

		entry = alloc_msi_entry(&dev->dev, 1, curmsk);