From: Kedareswara rao Appana <appana.durga.rao@xilinx.com>
To: <michal.simek@xilinx.com>, <soren.brinkmann@xilinx.com>,
<appanad@xilinx.com>, <f.fainelli@gmail.com>, <andrew@lunn.ch>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>, <netdev@vger.kernel.org>
Subject: [PATCH 1/2] net: phy: Add error checks in the driver
Date: Fri, 19 Aug 2016 18:18:10 +0530 [thread overview]
Message-ID: <1471610891-13353-1-git-send-email-appanad@xilinx.com> (raw)
This patch adds the necessary error checks in the driver.
Reported-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
---
drivers/net/phy/xilinx_gmii2rgmii.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c
index e7a20ec..7336fd0 100644
--- a/drivers/net/phy/xilinx_gmii2rgmii.c
+++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -39,11 +39,16 @@ struct gmii2rgmii {
static int xgmiitorgmii_read_status(struct phy_device *phydev)
{
struct gmii2rgmii *priv = phydev->priv;
- u16 val = 0;
+ int err, val = 0;
- priv->phy_drv->read_status(phydev);
+ err = priv->phy_drv->read_status(phydev);
+ if (err < 0)
+ return err;
val = mdiobus_read(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG);
+ if (val < 0)
+ return val;
+
val &= XILINX_GMII2RGMII_SPEED_MASK;
if (phydev->speed == SPEED_1000)
@@ -53,7 +58,10 @@ static int xgmiitorgmii_read_status(struct phy_device *phydev)
else
val |= BMCR_SPEED10;
- mdiobus_write(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG, val);
+ err = mdiobus_write(phydev->mdio.bus, priv->addr, XILINX_GMII2RGMII_REG,
+ val);
+ if (err < 0)
+ return err;
return 0;
}
--
2.1.2
next reply other threads:[~2016-08-19 12:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-19 12:48 Kedareswara rao Appana [this message]
2016-08-19 12:48 ` [PATCH 2/2] net: phy: Fix race conditions in the driver Kedareswara rao Appana
2016-08-19 13:24 ` Andrew Lunn
2016-08-19 13:15 ` [PATCH 1/2] net: phy: Add error checks " Andrew Lunn
2016-08-19 13:18 ` Appana Durga Kedareswara Rao
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=1471610891-13353-1-git-send-email-appanad@xilinx.com \
--to=appana.durga.rao@xilinx.com \
--cc=andrew@lunn.ch \
--cc=appanad@xilinx.com \
--cc=f.fainelli@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.simek@xilinx.com \
--cc=netdev@vger.kernel.org \
--cc=soren.brinkmann@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).