projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
octeon
/
ethernet-mdio.c
diff --git
a/drivers/staging/octeon/ethernet-mdio.c
b/drivers/staging/octeon/ethernet-mdio.c
index 7e0be8d00dc3a55c2d4cb031c443d8c43c0de164..10a82ef3021529071476d6f5cc1ddbce9f093544 100644
(file)
--- a/
drivers/staging/octeon/ethernet-mdio.c
+++ b/
drivers/staging/octeon/ethernet-mdio.c
@@
-113,7
+113,7
@@
int cvm_oct_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
if (!priv->phydev)
return -EINVAL;
- return phy_mii_ioctl(priv->phydev,
if_mii(rq)
, cmd);
+ return phy_mii_ioctl(priv->phydev,
rq
, cmd);
}
static void cvm_oct_adjust_link(struct net_device *dev)