diff --git a/[refs] b/[refs]
index 5dbab8845830..cd604293082a 100644
--- 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
index 7d482a2316ac..142c381e1d73 100644
--- 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)