Commit a37503bc authored by Jeremy Linton's avatar Jeremy Linton Committed by David S. Miller

net: smsc911x: Fix bug where PHY interrupts are overwritten by 0

By default, mdiobus_alloc() sets the PHYs to polling mode, but a
pointer size memcpy means that a couple IRQs end up being overwritten
with a value of 0. This means that PHY_POLL is disabled and results
in unpredictable behavior depending on the PHY's location on the
MDIO bus. Remove that memcpy and the now unused phy_irq member to
force the SMSC911x PHYs into polling mode 100% of the time.

Fixes: e7f4dc35 ("mdio: Move allocation of interrupts into core")
Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c40e4096
...@@ -116,7 +116,6 @@ struct smsc911x_data { ...@@ -116,7 +116,6 @@ struct smsc911x_data {
struct phy_device *phy_dev; struct phy_device *phy_dev;
struct mii_bus *mii_bus; struct mii_bus *mii_bus;
int phy_irq[PHY_MAX_ADDR];
unsigned int using_extphy; unsigned int using_extphy;
int last_duplex; int last_duplex;
int last_carrier; int last_carrier;
...@@ -1073,7 +1072,6 @@ static int smsc911x_mii_init(struct platform_device *pdev, ...@@ -1073,7 +1072,6 @@ static int smsc911x_mii_init(struct platform_device *pdev,
pdata->mii_bus->priv = pdata; pdata->mii_bus->priv = pdata;
pdata->mii_bus->read = smsc911x_mii_read; pdata->mii_bus->read = smsc911x_mii_read;
pdata->mii_bus->write = smsc911x_mii_write; pdata->mii_bus->write = smsc911x_mii_write;
memcpy(pdata->mii_bus->irq, pdata->phy_irq, sizeof(pdata->mii_bus));
pdata->mii_bus->parent = &pdev->dev; pdata->mii_bus->parent = &pdev->dev;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment