* [PATCH net-next] ibmvnic: Clean up resources on probe failure
@ 2017-08-08 19:28 Nathan Fontenot
2017-08-10 5:31 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Nathan Fontenot @ 2017-08-08 19:28 UTC (permalink / raw)
To: netdev; +Cc: jallen, tlfalcon
Ensure that any resources allocated during probe are released if the
probe of the driver fails.
Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
---
drivers/net/ethernet/ibm/ibmvnic.c | 26 +++++++++++++++-----------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c
index 5932160..24f536b 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3827,31 +3827,35 @@ static int ibmvnic_probe(struct vio_dev *dev, const struct vio_device_id *id)
do {
rc = ibmvnic_init(adapter);
- if (rc && rc != EAGAIN) {
- free_netdev(netdev);
- return rc;
- }
+ if (rc && rc != EAGAIN)
+ goto ibmvnic_init_fail;
} while (rc == EAGAIN);
netdev->mtu = adapter->req_mtu - ETH_HLEN;
rc = device_create_file(&dev->dev, &dev_attr_failover);
- if (rc) {
- free_netdev(netdev);
- return rc;
- }
+ if (rc)
+ goto ibmvnic_init_fail;
rc = register_netdev(netdev);
if (rc) {
dev_err(&dev->dev, "failed to register netdev rc=%d\n", rc);
- device_remove_file(&dev->dev, &dev_attr_failover);
- free_netdev(netdev);
- return rc;
+ goto ibmvnic_register_fail;
}
dev_info(&dev->dev, "ibmvnic registered\n");
adapter->state = VNIC_PROBED;
return 0;
+
+ibmvnic_register_fail:
+ device_remove_file(&dev->dev, &dev_attr_failover);
+
+ibmvnic_init_fail:
+ release_sub_crqs(adapter);
+ release_crq_queue(adapter);
+ free_netdev(netdev);
+
+ return rc;
}
static int ibmvnic_remove(struct vio_dev *dev)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next] ibmvnic: Clean up resources on probe failure
2017-08-08 19:28 [PATCH net-next] ibmvnic: Clean up resources on probe failure Nathan Fontenot
@ 2017-08-10 5:31 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-08-10 5:31 UTC (permalink / raw)
To: nfont; +Cc: netdev, jallen, tlfalcon
From: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Date: Tue, 08 Aug 2017 14:28:45 -0500
> Ensure that any resources allocated during probe are released if the
> probe of the driver fails.
>
> Signed-off-by: Nathan Fontenot <nfont@linux.vnet.ibm.com>
Applied, but:
> +
> +ibmvnic_register_fail:
> + device_remove_file(&dev->dev, &dev_attr_failover);
> +
^^^^^^
That last line has trailing whitespace, which I had to fix up.
Please take care of this next time.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-10 5:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-08 19:28 [PATCH net-next] ibmvnic: Clean up resources on probe failure Nathan Fontenot
2017-08-10 5:31 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).