| Message ID | 20200629120346.4382-2-brgl@bgdev.pl |
|---|---|
| State | Superseded |
| Headers | show |
| Series | net: improve devres helpers | expand |
> -----Original Message----- > From: Bartosz Golaszewski <brgl@bgdev.pl> > Sent: Monday, June 29, 2020 05:04 > To: Kirsher, Jeffrey T <jeffrey.t.kirsher@intel.com>; David S . Miller > <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>; John Crispin > <john@phrozen.org>; Sean Wang <sean.wang@mediatek.com>; Mark Lee > <Mark-MC.Lee@mediatek.com>; Matthias Brugger > <matthias.bgg@gmail.com>; Heiner Kallweit <hkallweit1@gmail.com>; Andrew > Lunn <andrew@lunn.ch>; Florian Fainelli <f.fainelli@gmail.com>; Russell King > <linux@armlinux.org.uk>; Rob Herring <robh+dt@kernel.org>; Frank Rowand > <frowand.list@gmail.com> > Cc: linux-kernel@vger.kernel.org; netdev@vger.kernel.org; linux-arm- > kernel@lists.infradead.org; linux-mediatek@lists.infradead.org; > devicetree@vger.kernel.org; Bartosz Golaszewski > <bgolaszewski@baylibre.com> > Subject: [PATCH v2 01/10] net: ethernet: ixgbe: check the return value of > ixgbe_mii_bus_init() > > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > This function may fail. Check its return value and propagate the error code. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 97a423ecf808..8752b5eea091 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -11175,10 +11175,14 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) IXGBE_LINK_SPEED_10GB_FULL | IXGBE_LINK_SPEED_1GB_FULL, true); - ixgbe_mii_bus_init(hw); + err = ixgbe_mii_bus_init(hw); + if (err) + goto err_netdev; return 0; +err_netdev: + unregister_netdev(netdev); err_register: ixgbe_release_hw_control(adapter); ixgbe_clear_interrupt_scheme(adapter);