---

yaml --- r: 112169 b: refs/heads/master c: c6d6a51 h: refs/heads/master i: 112167: 8f23b4e v: v3
git-mirror · Oct 8, 2008 · 4254e9e · 4254e9e
1 parent c4ab119
commit 4254e9e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dd565134ece7e5d528d4c5288879310c54419e9
+refs/heads/master: c6d6a511d768cf7627ab54fc18f40edf85097362
diff --git a/trunk/drivers/net/phy/phy.c b/trunk/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;