projects
/
platform
/
kernel
/
linux-exynos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pci-v4.2-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
[platform/kernel/linux-exynos.git]
/
drivers
/
ntb
/
ntb_hw.c
diff --git
a/drivers/ntb/ntb_hw.c
b/drivers/ntb/ntb_hw.c
index
8225cbc
..
3f67386
100644
(file)
--- a/
drivers/ntb/ntb_hw.c
+++ b/
drivers/ntb/ntb_hw.c
@@
-1658,6
+1658,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)
@@
-1776,7
+1777,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 err
3
;
+ goto err
4
;
}
}