diff options
| author | Nathan Fontenot | 2017-06-21 22:41:02 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-06-22 17:32:26 +0200 |
| commit | 6d659237657c64e9e2a930865da4c777239b678e (patch) | |
| tree | 92eb7063d4bbbd07b194151e3bbe415f3c1b9d5e /drivers/net/ethernet/ibm/ibmvnic.c | |
| parent | Merge branch 'ibmvnic-Correct-long-term-mapped-buffer-error-handling' (diff) | |
| download | kernel-qcow2-linux-6d659237657c64e9e2a930865da4c777239b678e.tar.gz kernel-qcow2-linux-6d659237657c64e9e2a930865da4c777239b678e.tar.xz kernel-qcow2-linux-6d659237657c64e9e2a930865da4c777239b678e.zip | |
ibmvnic: Correct return code checking for ibmvnic_init during probe
The update to ibmvnic_init to allow an EAGAIN return code broke
the calling of ibmvnic_init from ibmvnic_probe. The code now
will return from this point in the probe routine if anything
other than EAGAIN is returned. The check should be to see if rc
is non-zero and not equal to EAGAIN.
Without this fix, the vNIC driver can return 0 (success) from
its probe routine due to ibmvnic_init returning zero, but before
completing the probe process and registering with the netdev layer.
Fixes: 6a2fb0e99f9c (ibmvnic: driver initialization for kdump/kexec)
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ibm/ibmvnic.c')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index aab69dd018d4..87db1eb5cc44 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -3726,7 +3726,7 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id) do { rc = ibmvnic_init(adapter); - if (rc != EAGAIN) { + if (rc && rc != EAGAIN) { free_netdev(netdev); return rc; } |