Commit c828827f authored Sep 23, 2011 by Shawn Guo Committed by David S. Miller Sep 23, 2011

net/fec: fix fec1 check in fec_enet_mii_init()



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>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a9b2c8ef

drivers/net/ethernet/freescale/fec.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;