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
Unified · Split
| @@ -1660,6 +1660,7 @@ static int ntb_atom_detect(struct ntb_device *ndev) · 1659 unmodified lines | |||
| 1660 | u32 ppd; | 1660 | u32 ppd; |
| 1661 | 1661 | ||
| 1662 | ndev->hw_type = BWD_HW; | 1662 | ndev->hw_type = BWD_HW; |
| 1663 | ndev->limits.max_mw = BWD_MAX_MW; | ||
| 1663 | 1664 | ||
| 1664 | rc = pci_read_config_dword(ndev->pdev, NTB_PPD_OFFSET, &ppd); | 1665 | rc = pci_read_config_dword(ndev->pdev, NTB_PPD_OFFSET, &ppd); |
| 1665 | if (rc) | 1666 | if (rc) |
| @@ -1778,7 +1779,7 @@ static int ntb_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) · 112 unmodified lines | |||
| 1778 | dev_warn(&pdev->dev, "Cannot remap BAR %d\n", | 1779 | dev_warn(&pdev->dev, "Cannot remap BAR %d\n", |
| 1779 | MW_TO_BAR(i)); | 1780 | MW_TO_BAR(i)); |
| 1780 | rc = -EIO; | 1781 | rc = -EIO; |
| 1781 | goto err3; | 1782 | goto err4; |
| 1782 | } | 1783 | } |
| 1783 | } | 1784 | } |
| 1784 | 1785 | ||