diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2016-04-25 19:41:38 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 21:51:25 +0200 |
| commit | 62522ef3c399996f6c8120bfd14b94280bc9f490 (patch) | |
| tree | 9c193dd9fdfbf9a11889ffb48b4006b4123e9d51 /drivers/net | |
| parent | Merge tag 'wireless-drivers-for-davem-2016-04-25' of git://git.kernel.org/pub... (diff) | |
| download | linux-62522ef3c399996f6c8120bfd14b94280bc9f490.tar.xz linux-62522ef3c399996f6c8120bfd14b94280bc9f490.zip | |
net: ethernet: davinci_emac: Fix devioctl while in fixed link
When configured in fixed link, the DaVinci emac driver sets the
priv->phydev to NULL and further ioctl calls to the phy_mii_ioctl()
causes the kernel to crash.
Cc: Brian Hutchinson <b.hutchman@gmail.com>
Fixes: 1bb6aa56bb38 ("net: davinci_emac: Add support for fixed-link PHY")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Mugunthan V N <mugunthanvnm@ti.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ti/davinci_emac.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 58d58f002559..f56d66e6ec15 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1512,7 +1512,10 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) /* TODO: Add phy read and write and private statistics get feature */ - return phy_mii_ioctl(priv->phydev, ifrq, cmd); + if (priv->phydev) + return phy_mii_ioctl(priv->phydev, ifrq, cmd); + else + return -EOPNOTSUPP; } static int match_first_device(struct device *dev, void *data) |