diff options
Diffstat (limited to 'drivers/net/tulip/uli526x.c')
-rw-r--r-- | drivers/net/tulip/uli526x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index 96de5829b940..74217dbf0143 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
@@ -480,7 +480,7 @@ static int uli526x_open(struct net_device *dev) | |||
480 | init_timer(&db->timer); | 480 | init_timer(&db->timer); |
481 | db->timer.expires = ULI526X_TIMER_WUT + HZ * 2; | 481 | db->timer.expires = ULI526X_TIMER_WUT + HZ * 2; |
482 | db->timer.data = (unsigned long)dev; | 482 | db->timer.data = (unsigned long)dev; |
483 | db->timer.function = &uli526x_timer; | 483 | db->timer.function = uli526x_timer; |
484 | add_timer(&db->timer); | 484 | add_timer(&db->timer); |
485 | 485 | ||
486 | return 0; | 486 | return 0; |
@@ -1747,7 +1747,7 @@ static u16 phy_readby_cr10(unsigned long iobase, u8 phy_addr, u8 offset) | |||
1747 | if(cr10_value&0x10000000) | 1747 | if(cr10_value&0x10000000) |
1748 | break; | 1748 | break; |
1749 | } | 1749 | } |
1750 | return (cr10_value&0x0ffff); | 1750 | return cr10_value & 0x0ffff; |
1751 | } | 1751 | } |
1752 | 1752 | ||
1753 | static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data) | 1753 | static void phy_writeby_cr10(unsigned long iobase, u8 phy_addr, u8 offset, u16 phy_data) |