diff options
| author | Mark Kelly <mark@bifferos.com> | 2009-08-20 03:26:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-24 04:16:28 +0200 |
| commit | e03f614af7811f9d089862a8700e683dcc6963c6 (patch) | |
| tree | fe3601dd84d13d2d4d99b03390caae588ba83bc5 /drivers/net/r6040.c | |
| parent | r6040: remove unused pioaddr variable (diff) | |
| download | linux-e03f614af7811f9d089862a8700e683dcc6963c6.tar.xz linux-e03f614af7811f9d089862a8700e683dcc6963c6.zip | |
r6040: move down second PHY detection to r6040_init_one
Instead of fully initializing an unusable second r6040
device, perform the PHY detection earlier and bail out
in r6040_init_one when we could not read the PHY identifier.
Signed-off-by: Mark Kelly <mark@bifferos.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/r6040.c')
| -rw-r--r-- | drivers/net/r6040.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 60bd010e8e42..7238a6fae140 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -750,14 +750,6 @@ 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); @@ -1194,6 +1186,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, lp->mii_if.phy_id_mask = 0x1f; lp->mii_if.reg_num_mask = 0x1f; + /* Check the vendor ID on the PHY, if 0xffff assume none attached */ + if (r6040_phy_read(ioaddr, lp->phy_addr, 2) == 0xffff) { + printk(KERN_ERR DRV_NAME ": Failed to detect an attached PHY\n"); + err = -ENODEV; + goto err_out_unmap; + } + /* Register net device. After this dev->name assign */ err = register_netdev(dev); if (err) { |