From: Saravana Kannan <saravanak@google.com> To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>, Russell King <linux@armlinux.org.uk>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org> Cc: Saravana Kannan <saravanak@google.com>, Marc Zyngier <maz@kernel.org>, Neil Armstrong <narmstrong@baylibre.com>, Kevin Hilman <khilman@baylibre.com>, kernel-team@android.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 2/3] net: mdio-mux: Don't ignore memory allocation errors Date: Wed, 4 Aug 2021 14:43:31 -0700 [thread overview] Message-ID: <20210804214333.927985-3-saravanak@google.com> (raw) In-Reply-To: <20210804214333.927985-1-saravanak@google.com> If we are seeing memory allocation errors, don't try to continue registering child mdiobus devices. It's unlikely they'll succeed. Signed-off-by: Saravana Kannan <saravanak@google.com> --- drivers/net/mdio/mdio-mux.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/net/mdio/mdio-mux.c b/drivers/net/mdio/mdio-mux.c index 5b37284f54d6..13035e2685c4 100644 --- a/drivers/net/mdio/mdio-mux.c +++ b/drivers/net/mdio/mdio-mux.c @@ -82,6 +82,17 @@ static int mdio_mux_write(struct mii_bus *bus, int phy_id, static int parent_count; +static void mdio_mux_uninit_children(struct mdio_mux_parent_bus *pb) +{ + struct mdio_mux_child_bus *cb = pb->children; + + while (cb) { + mdiobus_unregister(cb->mii_bus); + mdiobus_free(cb->mii_bus); + cb = cb->next; + } +} + int mdio_mux_init(struct device *dev, struct device_node *mux_node, int (*switch_fn)(int cur, int desired, void *data), @@ -144,7 +155,7 @@ int mdio_mux_init(struct device *dev, cb = devm_kzalloc(dev, sizeof(*cb), GFP_KERNEL); if (!cb) { ret_val = -ENOMEM; - continue; + goto err_loop; } cb->bus_number = v; cb->parent = pb; @@ -152,8 +163,7 @@ int mdio_mux_init(struct device *dev, cb->mii_bus = mdiobus_alloc(); if (!cb->mii_bus) { ret_val = -ENOMEM; - devm_kfree(dev, cb); - continue; + goto err_loop; } cb->mii_bus->priv = cb; @@ -181,6 +191,10 @@ int mdio_mux_init(struct device *dev, } dev_err(dev, "Error: No acceptable child buses found\n"); + +err_loop: + mdio_mux_uninit_children(pb); + of_node_put(child_bus_node); err_pb_kz: put_device(&parent_bus->dev); err_parent_bus: @@ -192,14 +206,8 @@ EXPORT_SYMBOL_GPL(mdio_mux_init); void mdio_mux_uninit(void *mux_handle) { struct mdio_mux_parent_bus *pb = mux_handle; - struct mdio_mux_child_bus *cb = pb->children; - - while (cb) { - mdiobus_unregister(cb->mii_bus); - mdiobus_free(cb->mii_bus); - cb = cb->next; - } + mdio_mux_uninit_children(pb); put_device(&pb->mii_bus->dev); } EXPORT_SYMBOL_GPL(mdio_mux_uninit); -- 2.32.0.554.ge1b32706d8-goog
next prev parent reply other threads:[~2021-08-04 21:43 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-04 21:43 [PATCH v1 0/3] Clean up and fix error handling in mdio_mux_init() Saravana Kannan 2021-08-04 21:43 ` [PATCH v1 1/3] net: mdio-mux: Delete unnecessary devm_kfree Saravana Kannan 2021-08-07 14:23 ` Andrew Lunn 2021-08-04 21:43 ` Saravana Kannan [this message] 2021-08-07 15:46 ` [PATCH v1 2/3] net: mdio-mux: Don't ignore memory allocation errors Andrew Lunn 2021-08-04 21:43 ` [PATCH v1 3/3] net: mdio-mux: Handle -EPROBE_DEFER correctly Saravana Kannan 2021-08-07 15:49 ` Andrew Lunn 2021-08-05 9:02 ` [PATCH v1 0/3] Clean up and fix error handling in mdio_mux_init() Marc Zyngier 2021-08-05 18:36 ` Kevin Hilman 2021-08-05 18:37 ` Kevin Hilman 2021-08-05 18:47 ` Saravana Kannan 2021-08-05 10:31 ` David Miller
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210804214333.927985-3-saravanak@google.com \ --to=saravanak@google.com \ --cc=andrew@lunn.ch \ --cc=davem@davemloft.net \ --cc=hkallweit1@gmail.com \ --cc=kernel-team@android.com \ --cc=khilman@baylibre.com \ --cc=kuba@kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=maz@kernel.org \ --cc=narmstrong@baylibre.com \ --cc=netdev@vger.kernel.org \ --subject='Re: [PATCH v1 2/3] net: mdio-mux: Don'\''t ignore memory allocation errors' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
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).