---

yaml --- r: 203665 b: refs/heads/master c: 4cfa580 h: refs/heads/master i: 203663: 68b9492 v: v3
git-mirror · Jul 22, 2010 · 4f0c94a · 4f0c94a
1 parent 2296f01
commit 4f0c94a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c3e5edf2f33546392fbd9beaae04e9bed7304ff
+refs/heads/master: 4cfa580e7eebb8694b875d2caff3b989ada2efac
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
@@ -510,7 +510,7 @@ static int r6040_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	if (!lp->phydev)
 		return -EINVAL;
 
-	return phy_mii_ioctl(lp->phydev, if_mii(rq), cmd);
+	return phy_mii_ioctl(lp->phydev, rq, cmd);
 }
 
 static int r6040_rx(struct net_device *dev, int limit)