diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-12 09:38:08 -0400 |
| commit | edc72786d208e77db94f84dcb0d166c0d23d82f7 (patch) | |
| tree | 6fd32770f9cb2f1a888775514294d60aecba5245 /drivers/net/pasemi_mac_ethtool.c | |
| parent | 6a5e293f1b34920c69a932ce37b4a4714a428dc7 (diff) | |
| parent | 4367216a099b4df3fa2c4f2b086cda1a1e9afc4e (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers/net/pasemi_mac_ethtool.c')
| -rw-r--r-- | drivers/net/pasemi_mac_ethtool.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/pasemi_mac_ethtool.c index 064a4fe1dd90..28a86224879d 100644 --- a/drivers/net/pasemi_mac_ethtool.c +++ b/drivers/net/pasemi_mac_ethtool.c | |||
| @@ -71,6 +71,9 @@ pasemi_mac_ethtool_get_settings(struct net_device *netdev, | |||
| 71 | struct pasemi_mac *mac = netdev_priv(netdev); | 71 | struct pasemi_mac *mac = netdev_priv(netdev); |
| 72 | struct phy_device *phydev = mac->phydev; | 72 | struct phy_device *phydev = mac->phydev; |
| 73 | 73 | ||
| 74 | if (!phydev) | ||
| 75 | return -EOPNOTSUPP; | ||
| 76 | |||
| 74 | return phy_ethtool_gset(phydev, cmd); | 77 | return phy_ethtool_gset(phydev, cmd); |
| 75 | } | 78 | } |
| 76 | 79 | ||