Merge branch 'for-2.6.40/splice' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / drivers / net / smsc9420.c

diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c
index 6cdee6a15f9f2897fa06baa40ad5c34c90c2e27d..4c92ad8be765da20c6fa4f6f38b0756e1449904d 100644 (file)
--- a/drivers/net/smsc9420.c
+++ b/drivers/net/smsc9420.c
@@ -245,7 +245,7 @@ static int smsc9420_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        if (!netif_running(dev) || !pd->phy_dev)
                return -EINVAL;
 
-       return phy_mii_ioctl(pd->phy_dev, if_mii(ifr), cmd);
+       return phy_mii_ioctl(pd->phy_dev, ifr, cmd);
 }
 
 static int smsc9420_ethtool_get_settings(struct net_device *dev,
@@ -364,7 +364,7 @@ static int smsc9420_eeprom_send_cmd(struct smsc9420_pdata *pd, u32 op)
        }
 
        if (e2cmd & E2P_CMD_EPC_TIMEOUT_) {
-               smsc_info(HW, "Error occured during eeprom operation");
+               smsc_info(HW, "Error occurred during eeprom operation");
                return -EINVAL;
        }