linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
To: <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: <kuba@kernel.org>, <michal.simek@xilinx.com>,
	<mchehab+samsung@kernel.org>, <gregkh@linuxfoundation.org>,
	<nicolas.ferre@microchip.com>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>, <git@xilinx.com>,
	Shravya Kumbham <shravya.kumbham@xilinx.com>,
	Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
Subject: [PATCH net v2] net: emaclite: Add error handling for of_address_ and _mdio_setup functions
Date: Tue, 17 Nov 2020 17:37:57 +0530	[thread overview]
Message-ID: <1605614877-5670-1-git-send-email-radhey.shyam.pandey@xilinx.com> (raw)

From: Shravya Kumbham <shravya.kumbham@xilinx.com>

Add ret variable, condition to check the return value and error
path for the of_address_to_resource() function. It also adds error
handling for mdio setup and decrement refcount of phy node.

Addresses-Coverity: Event check_return value.
Signed-off-by: Shravya Kumbham <shravya.kumbham@xilinx.com>
Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com>
---
Changes for v2:

- Change subject_prefix to target net tree.
- Add error handling for mdio_setup and remove phy_read changes.
  Error checking of phy_read will be added along with phy_write
  in a followup patch. Document the changes in commit description.
---
 drivers/net/ethernet/xilinx/xilinx_emaclite.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
index 0c26f5bcc523..4e0005164785 100644
--- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c
+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -820,7 +820,7 @@ static int xemaclite_mdio_write(struct mii_bus *bus, int phy_id, int reg,
 static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
 {
 	struct mii_bus *bus;
-	int rc;
+	int rc, ret;
 	struct resource res;
 	struct device_node *np = of_get_parent(lp->phy_node);
 	struct device_node *npp;
@@ -834,7 +834,12 @@ static int xemaclite_mdio_setup(struct net_local *lp, struct device *dev)
 	}
 	npp = of_get_parent(np);
 
-	of_address_to_resource(npp, 0, &res);
+	ret = of_address_to_resource(npp, 0, &res);
+	if (ret) {
+		dev_err(dev, "%s resource error!\n",
+			dev->of_node->full_name);
+		return ret;
+	}
 	if (lp->ndev->mem_start != res.start) {
 		struct phy_device *phydev;
 		phydev = of_phy_find_device(lp->phy_node);
@@ -1173,7 +1178,11 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
 	xemaclite_update_address(lp, ndev->dev_addr);
 
 	lp->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0);
-	xemaclite_mdio_setup(lp, &ofdev->dev);
+	rc = xemaclite_mdio_setup(lp, &ofdev->dev);
+	if (rc) {
+		dev_warn(dev, "error registering MDIO bus: %d\n", rc);
+		goto error;
+	}
 
 	dev_info(dev, "MAC address is now %pM\n", ndev->dev_addr);
 
@@ -1197,6 +1206,7 @@ static int xemaclite_of_probe(struct platform_device *ofdev)
 	return 0;
 
 error:
+	of_node_put(lp->phy_node);
 	free_netdev(ndev);
 	return rc;
 }
-- 
2.7.4


             reply	other threads:[~2020-11-17 12:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-17 12:07 Radhey Shyam Pandey [this message]
2020-11-17 13:13 ` [PATCH net v2] net: emaclite: Add error handling for of_address_ and _mdio_setup functions Denis Kirjanov
2020-12-17 18:23   ` Radhey Shyam Pandey

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=1605614877-5670-1-git-send-email-radhey.shyam.pandey@xilinx.com \
    --to=radhey.shyam.pandey@xilinx.com \
    --cc=davem@davemloft.net \
    --cc=git@xilinx.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=kuba@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mchehab+samsung@kernel.org \
    --cc=michal.simek@xilinx.com \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.ferre@microchip.com \
    --cc=shravya.kumbham@xilinx.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).