diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-09-18 05:06:52 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-09 00:24:56 +0200 |
| commit | c6d6a511d768cf7627ab54fc18f40edf85097362 (patch) | |
| tree | 73b390800c656c2304c911ce8c5b45330053706a /drivers/net/phy | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff) | |
| download | linux-c6d6a511d768cf7627ab54fc18f40edf85097362.tar.xz linux-c6d6a511d768cf7627ab54fc18f40edf85097362.zip | |
phylib: phy_mii_ioctl() fixes
Make the SIOCGMIIPHY case fall through properly (it is supposed
to not only return the ID of the default PHY but also to read from
that PHY), and make phy_mii_ioctl() return the same error code as
generic_mii_ioctl() in case of an unsupported operation.
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Acked-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/phy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 45cc2914d347..0433fcd00943 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -366,7 +366,8 @@ int phy_mii_ioctl(struct phy_device *phydev, switch (cmd) { case SIOCGMIIPHY: mii_data->phy_id = phydev->addr; - break; + /* fall through */ + case SIOCGMIIREG: mii_data->val_out = phy_read(phydev, mii_data->reg_num); break; @@ -413,7 +414,7 @@ int phy_mii_ioctl(struct phy_device *phydev, break; default: - return -ENOTTY; + return -EOPNOTSUPP; } return 0; |