Commit dc75117f authored Jun 14, 2015 by Linus Torvalds

Merge tag 'ntb-4.1' of git://github.com/jonmason/ntb

Pull NTB fixes from Jon Mason:
 "I apologize for the tardiness of this request.  Here are a couple of
  last minute NTB bug fixes for v4.1:

  NTB bug fixes to address issues in unmapping the MW reg base and
  vbase, and an uninitialized variable on Atom platforms"

* tag 'ntb-4.1' of git://github.com/jonmason/ntb:
  ntb: initialize max_mw for Atom before using it
  ntb: iounmap MW reg and vbase in error path

parents 1f1e34f7 ebaad132

drivers/ntb/ntb_hw.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1660,6 +1660,7 @@ static int ntb_atom_detect(struct ntb_device *ndev)
		u32 ppd;

		ndev->hw_type = BWD_HW;
		ndev->limits.max_mw = BWD_MAX_MW;

		rc = pci_read_config_dword(ndev->pdev, NTB_PPD_OFFSET, &ppd);
		if (rc)
		@@ -1778,7 +1779,7 @@ static int ntb_pci_probe(struct pci_dev pdev, const struct pci_device_id id)
		dev_warn(&pdev->dev, "Cannot remap BAR %d\n",
		MW_TO_BAR(i));
		rc = -EIO;
		goto err3;
		goto err4;
		}
		}