diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-27 11:05:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-27 11:05:49 -0700 |
| commit | 0cd81d77d0569f1dc1e39abeea93c6184e9b5b54 (patch) | |
| tree | 4de744e901974a07202b6849877688ba1cb86581 /drivers/ntb/test/ntb_perf.c | |
| parent | ea1e2bbec6edb34fd13032bdfc80276526e87967 (diff) | |
| parent | 4720101fab62d0453babb0287b58a9c5bf78fb80 (diff) | |
Merge tag 'ntb-5.4' of git://github.com/jonmason/ntb
Pull NTB updates from Jon Mason:
"A few bugfixes and support for new AMD NTB hardware"
* tag 'ntb-5.4' of git://github.com/jonmason/ntb:
NTB: fix IDT Kconfig typos/spellos
ntb_hw_amd: Add memory window support for new AMD hardware
ntb_hw_amd: Add a new NTB PCI device ID
NTB: ntb_transport: remove redundant assignment to rc
ntb_hw_switchtec: make ntb_mw_set_trans() work when addr == 0
ntb: point to right memory window index
Diffstat (limited to 'drivers/ntb/test/ntb_perf.c')
| -rw-r--r-- | drivers/ntb/test/ntb_perf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c index d028331558ea..e9b7c2dfc730 100644 --- a/drivers/ntb/test/ntb_perf.c +++ b/drivers/ntb/test/ntb_perf.c @@ -1378,7 +1378,7 @@ static int perf_setup_peer_mw(struct perf_peer *peer) int ret; /* Get outbound MW parameters and map it */ - ret = ntb_peer_mw_get_addr(perf->ntb, peer->gidx, &phys_addr, + ret = ntb_peer_mw_get_addr(perf->ntb, perf->gidx, &phys_addr, &peer->outbuf_size); if (ret) return ret; |