[PATCH net-next V2] ibmvnic: Correct return code checking for ibmvnic_init during probe

[PATCH net-next V2] ibmvnic: Correct return code checking for ibmvnic_init during probe

[Nathan Fontenot]

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>
---
 drivers/net/ethernet/ibm/ibmvnic.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 0135095..05edf19 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3737,7 +3737,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;
 		}

Re: [PATCH net-next V2] ibmvnic: Correct return code checking for ibmvnic_init during probe

[David Miller]

From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Wed, 21 Jun 2017 15:41:02 -0500

> 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>

Applied.