From 4af9cf6fedca53a658def977276a54c77978f953 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sun, 7 Mar 2010 00:55:47 +0000 Subject: [PATCH] --- yaml --- r: 187958 b: refs/heads/master c: 9fba1c31f4f3f9f860a4afee0b409cde27d06741 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/cpmac.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a4f79ab202a9..0258a290fedb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30765d0502905a9248e5de72fc7ac83c23422861 +refs/heads/master: 9fba1c31f4f3f9f860a4afee0b409cde27d06741 diff --git a/trunk/drivers/net/cpmac.c b/trunk/drivers/net/cpmac.c index 55ee055d3321..baeb5bab05b5 100644 --- a/trunk/drivers/net/cpmac.c +++ b/trunk/drivers/net/cpmac.c @@ -1137,8 +1137,9 @@ static int __devinit cpmac_probe(struct platform_device *pdev) } if (phy_id == PHY_MAX_ADDR) { - dev_err(&pdev->dev, "no PHY present\n"); - return -ENODEV; + dev_err(&pdev->dev, "no PHY present, falling back to switch on MDIO bus 0\n"); + strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */ + phy_id = pdev->id; } dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);