From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/4] net/fec: fix fec1 check in fec_enet_mii_init()
Date: Sun, 18 Sep 2011 19:54:10 +0800 [thread overview]
Message-ID: <1316346852-17090-3-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1316346852-17090-1-git-send-email-shawn.guo@linaro.org>
In function fec_enet_mii_init(), it uses non-zero pdev->id as part
of the condition to check the second fec instance (fec1). This works
before the driver supports device tree probe. But in case of device
tree probe, pdev->id is -1 which is also non-zero, so the logic becomes
broken when device tree probe gets supported.
The patch change the logic to check "pdev->id > 0" as the part of the
condition for identifying fec1.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
---
drivers/net/fec.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 6a638e9..5ef0e34 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -996,7 +996,7 @@ static int fec_enet_mii_init(struct platform_device *pdev)
* mdio interface in board design, and need to be configured by
* fec0 mii_bus.
*/
- if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id) {
+ if ((id_entry->driver_data & FEC_QUIRK_ENET_MAC) && pdev->id > 0) {
/* fec1 uses fec0 mii_bus */
fep->mii_bus = fec0_mii_bus;
return 0;
--
1.7.4.1
next prev parent reply other threads:[~2011-09-18 11:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-18 11:54 [PATCH 0/4] add fec support for imx6q Shawn Guo
2011-09-18 11:54 ` [PATCH 1/4] net/fec: change phy-reset-gpio request warning to debug message Shawn Guo
2011-09-18 11:54 ` Shawn Guo [this message]
2011-09-18 11:54 ` [PATCH 3/4] net/fec: set phy_speed to the optimal frequency 2.5 MHz Shawn Guo
2011-09-19 22:39 ` Troy Kisky
2011-09-20 2:57 ` Shawn Guo
2011-09-20 20:05 ` Troy Kisky
2011-09-20 20:10 ` Troy Kisky
2011-09-20 7:50 ` Lothar Waßmann
2011-09-20 8:14 ` Shawn Guo
2011-09-20 19:11 ` David Miller
2011-09-18 11:54 ` [PATCH 4/4] net/fec: add imx6q enet support Shawn Guo
2011-09-18 18:09 ` Francois Romieu
2011-09-19 9:08 ` Shawn Guo
2011-09-20 19:08 ` [PATCH 0/4] add fec support for imx6q 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=1316346852-17090-3-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).