From: Dan Carpenter <dan.carpenter@oracle.com>
To: "David S. Miller" <davem@davemloft.net>,
Esben Haabendal <esben@geanix.com>
Cc: Michal Simek <michal.simek@xilinx.com>,
Andrew Lunn <andrew@lunn.ch>, Yang Wei <yang.wei9@zte.com.cn>,
YueHaibing <yuehaibing@huawei.com>,
Luis Chamberlain <mcgrof@kernel.org>,
netdev@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH 1/2 net-next] net: ll_temac: Fix an NULL vs IS_ERR() check in temac_open()
Date: Fri, 3 May 2019 15:50:24 +0300 [thread overview]
Message-ID: <20190503125024.GF29695@mwanda> (raw)
The phy_connect() function doesn't return NULL pointers. It returns
error pointers on error, so I have updated the check.
Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index 1003ee14c833..bcb97fbf5b54 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -927,9 +927,9 @@ static int temac_open(struct net_device *ndev)
} else if (strlen(lp->phy_name) > 0) {
phydev = phy_connect(lp->ndev, lp->phy_name, temac_adjust_link,
lp->phy_interface);
- if (!phydev) {
+ if (IS_ERR(phydev)) {
dev_err(lp->dev, "phy_connect() failed\n");
- return -ENODEV;
+ return PTR_ERR(phydev);
}
phy_start(phydev);
}
--
2.18.0
next reply other threads:[~2019-05-03 12:51 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 12:50 Dan Carpenter [this message]
2019-05-03 12:50 ` [PATCH 2/2 net-next] net: ll_temac: remove an unnecessary condition Dan Carpenter
2019-05-05 17:29 ` David Miller
2019-05-05 17:29 ` [PATCH 1/2 net-next] net: ll_temac: Fix an NULL vs IS_ERR() check in temac_open() 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=20190503125024.GF29695@mwanda \
--to=dan.carpenter@oracle.com \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=esben@geanix.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=mcgrof@kernel.org \
--cc=michal.simek@xilinx.com \
--cc=netdev@vger.kernel.org \
--cc=yang.wei9@zte.com.cn \
--cc=yuehaibing@huawei.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).