Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+2
-1
+2
-1
drivers/ntb/ntb_hw.c
+2
-1
drivers/ntb/ntb_hw.c
···
1660
1660
u32 ppd;
1661
1661
1662
1662
ndev->hw_type = BWD_HW;
1663
+
ndev->limits.max_mw = BWD_MAX_MW;
1663
1664
1664
1665
rc = pci_read_config_dword(ndev->pdev, NTB_PPD_OFFSET, &ppd);
1665
1666
if (rc)
···
1779
1778
dev_warn(&pdev->dev, "Cannot remap BAR %d\n",
1780
1779
MW_TO_BAR(i));
1781
1780
rc = -EIO;
1782
-
goto err3;
1781
+
goto err4;
1783
1782
}
1784
1783
}
1785
1784