| From a77789df7706c523999eefa1c7593e1516e402d1 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Thu, 12 Dec 2024 13:31:55 -0800 |
| Subject: ionic: Fix netdev notifier unregister on failure |
| |
| From: Brett Creeley <brett.creeley@amd.com> |
| |
| [ Upstream commit 9590d32e090ea2751e131ae5273859ca22f5ac14 ] |
| |
| If register_netdev() fails, then the driver leaks the netdev notifier. |
| Fix this by calling ionic_lif_unregister() on register_netdev() |
| failure. This will also call ionic_lif_unregister_phc() if it has |
| already been registered. |
| |
| Fixes: 30b87ab4c0b3 ("ionic: remove lif list concept") |
| Signed-off-by: Brett Creeley <brett.creeley@amd.com> |
| Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> |
| Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> |
| Link: https://patch.msgid.link/20241212213157.12212-2-shannon.nelson@amd.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c |
| index 40496587b2b3..3d3f936779f7 100644 |
| --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c |
| +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c |
| @@ -3869,8 +3869,8 @@ int ionic_lif_register(struct ionic_lif *lif) |
| /* only register LIF0 for now */ |
| err = register_netdev(lif->netdev); |
| if (err) { |
| - dev_err(lif->ionic->dev, "Cannot register net device, aborting\n"); |
| - ionic_lif_unregister_phc(lif); |
| + dev_err(lif->ionic->dev, "Cannot register net device: %d, aborting\n", err); |
| + ionic_lif_unregister(lif); |
| return err; |
| } |
| |
| -- |
| 2.39.5 |
| |
