summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorBert Kenward <bkenward@solarflare.com>2016-08-11 13:01:21 +0100
committerDavid S. Miller <davem@davemloft.net>2016-08-12 20:42:19 -0700
commit7014d7f672f7dc180d1386239c4f0c455e405ed9 (patch)
tree2fa8c6dbb677e0d2a940bd71b4386733a0b027b8 /drivers/net
parentd29e33d6d087ef66a70f94791504579366cf3d09 (diff)
downloadblackbird-op-linux-7014d7f672f7dc180d1386239c4f0c455e405ed9.tar.gz
blackbird-op-linux-7014d7f672f7dc180d1386239c4f0c455e405ed9.zip
sfc: allow asynchronous MCDI without completion function
Signed-off-by: Bert Kenward <bkenward@solarflare.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/sfc/mcdi.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c
index d28e7dd8fa3c..9fbc12a8f80c 100644
--- a/drivers/net/ethernet/sfc/mcdi.c
+++ b/drivers/net/ethernet/sfc/mcdi.c
@@ -548,7 +548,10 @@ static bool efx_mcdi_complete_async(struct efx_mcdi_iface *mcdi, bool timeout)
efx_mcdi_display_error(efx, async->cmd, async->inlen, errbuf,
err_len, rc);
}
- async->complete(efx, async->cookie, rc, outbuf, data_len);
+
+ if (async->complete)
+ async->complete(efx, async->cookie, rc, outbuf,
+ min(async->outlen, data_len));
kfree(async);
efx_mcdi_release(mcdi);
OpenPOWER on IntegriCloud