diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2015-09-03 23:22:16 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-09-30 13:20:51 +0100 |
| commit | 9a8359aea420f332c5cd7f7f1c216f1a8cec1949 (patch) | |
| tree | 80b8c995b1ed2136102fe28844501ca7d3fcb9f8 /drivers/net | |
| parent | 341805388b2136a2a5964161c7fe773e2a6e5033 (diff) | |
fixed_phy: pass 'irq' to fixed_phy_add()
commit bd1a05ee98b06c9a20138c45f96ccfddf3163f93 upstream.
I've noticed that fixed_phy_register() ignores its 'irq' parameter instead of
passing it to fixed_phy_add(). Luckily, fixed_phy_register() seems to always
be called with PHY_POLL for 'irq'... :-)
Fixes: a75951217472 ("net: phy: extend fixed driver with fixed_phy_register()")
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[ luis: backported to 3.16:
- fixed_phy_add() only has 3 parameters in 3.16 kernel ]
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/fixed.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index d60d875cb445..5ea82da50ceb 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c @@ -240,7 +240,7 @@ int fixed_phy_register(unsigned int irq, phy_addr = phy_fixed_addr++; spin_unlock(&phy_fixed_addr_lock); - ret = fixed_phy_add(PHY_POLL, phy_addr, status); + ret = fixed_phy_add(irq, phy_addr, status); if (ret < 0) return ret; |