diff options
| author | Mark Brown <broonie@kernel.org> | 2017-08-30 22:15:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-08-30 22:15:31 +0100 |
| commit | b388dc1f62a9bdd9c4758a0664e61d0f9a9da519 (patch) | |
| tree | 696fd3c245700ee59ebcf3a65b90f8773b904624 /drivers/ntb | |
| parent | 6969b2bae6dbe7f277a7c018b66d2f3ad662129f (diff) | |
| parent | cc4a41fe5541a73019a864883297bd5043aa6d98 (diff) | |
| download | lwn-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.tar.gz lwn-b388dc1f62a9bdd9c4758a0664e61d0f9a9da519.zip | |
Merge tag 'v4.13-rc7' into asoc-component
Linux 4.13-rc7
Diffstat (limited to 'drivers/ntb')
| -rw-r--r-- | drivers/ntb/ntb_transport.c | 6 | ||||
| -rw-r--r-- | drivers/ntb/test/ntb_tool.c | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ntb/ntb_transport.c b/drivers/ntb/ntb_transport.c index 9a03c5871efe..f58d8e305323 100644 --- a/drivers/ntb/ntb_transport.c +++ b/drivers/ntb/ntb_transport.c @@ -924,10 +924,8 @@ out1: ntb_free_mw(nt, i); /* if there's an actual failure, we should just bail */ - if (rc < 0) { - ntb_link_disable(ndev); + if (rc < 0) return; - } out: if (ntb_link_is_up(ndev, NULL, NULL) == 1) @@ -1059,7 +1057,7 @@ static int ntb_transport_probe(struct ntb_client *self, struct ntb_dev *ndev) int node; int rc, i; - mw_count = ntb_mw_count(ndev, PIDX); + mw_count = ntb_peer_mw_count(ndev); if (!ndev->ops->mw_set_trans) { dev_err(&ndev->dev, "Inbound MW based NTB API is required\n"); diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c index f002bf48a08d..a69815c45ce6 100644 --- a/drivers/ntb/test/ntb_tool.c +++ b/drivers/ntb/test/ntb_tool.c @@ -959,7 +959,7 @@ static int tool_probe(struct ntb_client *self, struct ntb_dev *ntb) tc->ntb = ntb; init_waitqueue_head(&tc->link_wq); - tc->mw_count = min(ntb_mw_count(tc->ntb, PIDX), MAX_MWS); + tc->mw_count = min(ntb_peer_mw_count(tc->ntb), MAX_MWS); for (i = 0; i < tc->mw_count; i++) { rc = tool_init_mw(tc, i); if (rc) |