diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2018-02-06 21:17:17 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-07 21:46:06 -0500 |
| commit | e729452ec33304260d4741e9ce67784a457ee1e6 (patch) | |
| tree | 6cb86722c7c984b82c01d81580373c0d94374e35 | |
| parent | 4d80ecdb80a7aab7652a206a1d948ef0d1df89b1 (diff) | |
cxgb4: Fix error handling path in 'init_one()'
Commit baf5086840ab1 ("cxgb4: restructure VF mgmt code") has reordered
some code but an error handling label has not been updated accordingly.
So fix it and free 'adapter' if 't4_wait_dev_ready()' fails.
Fixes: baf5086840ab1 ("cxgb4: restructure VF mgmt code")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c index 1ca2a39ed0f8..56bc626ef006 100644 --- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c @@ -5166,7 +5166,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->regs = regs; err = t4_wait_dev_ready(regs); if (err < 0) - goto out_unmap_bar0; + goto out_free_adapter; /* We control everything through one PF */ whoami = readl(regs + PL_WHOAMI_A); |