From 4f0c94ac2a6a1989e4a97fd4d97aa6d4e869da8d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Wed, 21 Jul 2010 21:10:49 -0700
Subject: [PATCH] --- yaml --- r: 203665 b: refs/heads/master c:
 4cfa580e7eebb8694b875d2caff3b989ada2efac h: refs/heads/master i:   203663:
 68b9492dcfc242534907208c10d7e327854fffbc v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r6040.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)