diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-18 14:10:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-18 14:10:59 +0000 |
| commit | 499e49b6d3a4c2ba21c175aa43a7d296724643c3 (patch) | |
| tree | efc6616cbfb571af30b37f203b26e49d1ccafbd9 /drivers/net/ethernet/broadcom/genet/bcmmii.c | |
| parent | 6aa800ca65b1788e8c2e4ffd1e57a4c4355fe0ed (diff) | |
| parent | 4dd638f8ac6b4ed020297b5d994d9346b84f2009 (diff) | |
| download | talos-obmc-linux-499e49b6d3a4c2ba21c175aa43a7d296724643c3.tar.gz talos-obmc-linux-499e49b6d3a4c2ba21c175aa43a7d296724643c3.zip | |
Merge tag 'spi-fix-v4.5-rc4' into spi-imx
spi: Fixes for v4.5
A small clutch of driver specific fixes. The OMAP one is a bit worrying
since it seems to be triggered by some changes in the runtime PM core
code and I suspect there's other drivers across that are going to be
using the same pattern outside of OMAP but nothing seems to be coming up
in the testing people are doing.
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmmii.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 0d775964b060..457c3bc8cfff 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -401,7 +401,7 @@ int bcmgenet_mii_probe(struct net_device *dev) * Ethernet MAC ISRs */ if (priv->internal_phy) - priv->mii_bus->irq[phydev->mdio.addr] = PHY_IGNORE_INTERRUPT; + priv->phydev->irq = PHY_IGNORE_INTERRUPT; return 0; } |
