summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2009-05-04 22:30:01 +0200
committerDavid S. Miller <davem@davemloft.net>2009-05-05 21:29:45 +0200
commitc8014fe1d4548da8b9ea54730852c48a7117b03f (patch)
treeadc1d1cd7dcab92c35bb2e10ad9c5df70882115f
parentbonding: get rid of CONFIG_PROC_FS ifdefs (diff)
downloadlinux-c8014fe1d4548da8b9ea54730852c48a7117b03f.tar.xz
linux-c8014fe1d4548da8b9ea54730852c48a7117b03f.zip
r6040: check for absent PHY
Some devices have two R6040 MACs but the second one is not wired to any PHY, therefore the interface is just unusable. Warn the user about that and prevent device from registering. Tested-by: bifferos <bifferos@yahoo.co.uk> Signed-off-by: Florian Fainelli <florian@openwrt.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/r6040.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c
index 6f97b47d74a6..65627253c988 100644
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -742,6 +742,14 @@ static int r6040_up(struct net_device *dev)
struct r6040_private *lp = netdev_priv(dev);
void __iomem *ioaddr = lp->base;
int ret;
+ u16 val;
+
+ /* Check presence of a second PHY */
+ val = r6040_phy_read(ioaddr, lp->phy_addr, 2);
+ if (val == 0xFFFF) {
+ printk(KERN_ERR DRV_NAME " no second PHY attached\n");
+ return -EIO;
+ }
/* Initialise and alloc RX/TX buffers */
r6040_init_txbufs(dev);