|
@@ -255,7 +255,8 @@ int fixed_phy_add(unsigned int irq, int phy_addr,
|
|
|
|
|
|
memset(fp->regs, 0xFF, sizeof(fp->regs[0]) * MII_REGS_NUM);
|
|
memset(fp->regs, 0xFF, sizeof(fp->regs[0]) * MII_REGS_NUM);
|
|
|
|
|
|
- fmb->mii_bus->irq[phy_addr] = irq;
|
|
|
|
|
|
+ if (irq != PHY_POLL)
|
|
|
|
+ fmb->mii_bus->irq[phy_addr] = irq;
|
|
|
|
|
|
fp->addr = phy_addr;
|
|
fp->addr = phy_addr;
|
|
fp->status = *status;
|
|
fp->status = *status;
|
|
@@ -314,6 +315,9 @@ struct phy_device *fixed_phy_register(unsigned int irq,
|
|
int phy_addr;
|
|
int phy_addr;
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
|
|
+ if (!fmb->mii_bus || fmb->mii_bus->state != MDIOBUS_REGISTERED)
|
|
|
|
+ return ERR_PTR(-EPROBE_DEFER);
|
|
|
|
+
|
|
/* Get the next available PHY address, up to PHY_MAX_ADDR */
|
|
/* Get the next available PHY address, up to PHY_MAX_ADDR */
|
|
spin_lock(&phy_fixed_addr_lock);
|
|
spin_lock(&phy_fixed_addr_lock);
|
|
if (phy_fixed_addr == PHY_MAX_ADDR) {
|
|
if (phy_fixed_addr == PHY_MAX_ADDR) {
|