diff options
| author | Zeng Zhaoming <b32542@freescale.com> | 2011-06-13 17:59:08 +0800 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2011-12-15 17:11:44 +0100 |
| commit | f1933830473f8e5111d94489b15c16672f7e5508 (patch) | |
| tree | b5989398850a2015aaeee5a4bd20daf79e06e6e0 /drivers | |
| parent | 9d83e793f2fee84e31044b0644a3aa52ab6a950c (diff) | |
ENGR00151519 FEC: Fix compile warning about incompatible pointer type
kernel compilation with a warning about fec.
drivers/net/fec.c:929: warning: initialization from incompatible pointer type.
This is caused by wrongly define get_link callback return type to int.
Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/fec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index e1964a34ed04..e7be0e5cad05 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -932,12 +932,12 @@ static void fec_enet_get_drvinfo(struct net_device *dev, strcpy(info->bus_info, dev_name(&dev->dev)); } -static unsigned int fec_enet_get_link(struct net_device *dev) +static u32 fec_enet_get_link(struct net_device *dev) { if (netif_running(dev)) return netif_carrier_ok(dev) ? 1 : 0; else - return -EINVAL; + return (u32)(-EINVAL); } static struct ethtool_ops fec_enet_ethtool_ops = { |