aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tlan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r--drivers/net/tlan.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c
index ccee3eddc5f4..0564ca05963d 100644
--- a/drivers/net/tlan.c
+++ b/drivers/net/tlan.c
@@ -393,7 +393,7 @@ TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type )
393 spin_unlock_irqrestore(&priv->lock, flags); 393 spin_unlock_irqrestore(&priv->lock, flags);
394 return; 394 return;
395 } 395 }
396 priv->timer.function = &TLan_Timer; 396 priv->timer.function = TLan_Timer;
397 if (!in_irq()) 397 if (!in_irq())
398 spin_unlock_irqrestore(&priv->lock, flags); 398 spin_unlock_irqrestore(&priv->lock, flags);
399 399
@@ -1453,7 +1453,7 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int )
1453 TLan_DioWrite8( dev->base_addr, 1453 TLan_DioWrite8( dev->base_addr,
1454 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); 1454 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
1455 if ( priv->timer.function == NULL ) { 1455 if ( priv->timer.function == NULL ) {
1456 priv->timer.function = &TLan_Timer; 1456 priv->timer.function = TLan_Timer;
1457 priv->timer.data = (unsigned long) dev; 1457 priv->timer.data = (unsigned long) dev;
1458 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; 1458 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
1459 priv->timerSetAt = jiffies; 1459 priv->timerSetAt = jiffies;
@@ -1601,7 +1601,7 @@ drop_and_reuse:
1601 TLan_DioWrite8( dev->base_addr, 1601 TLan_DioWrite8( dev->base_addr,
1602 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); 1602 TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT );
1603 if ( priv->timer.function == NULL ) { 1603 if ( priv->timer.function == NULL ) {
1604 priv->timer.function = &TLan_Timer; 1604 priv->timer.function = TLan_Timer;
1605 priv->timer.data = (unsigned long) dev; 1605 priv->timer.data = (unsigned long) dev;
1606 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; 1606 priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY;
1607 priv->timerSetAt = jiffies; 1607 priv->timerSetAt = jiffies;
@@ -1897,7 +1897,7 @@ static void TLan_Timer( unsigned long data )
1897 TLan_DioWrite8( dev->base_addr, 1897 TLan_DioWrite8( dev->base_addr,
1898 TLAN_LED_REG, TLAN_LED_LINK ); 1898 TLAN_LED_REG, TLAN_LED_LINK );
1899 } else { 1899 } else {
1900 priv->timer.function = &TLan_Timer; 1900 priv->timer.function = TLan_Timer;
1901 priv->timer.expires = priv->timerSetAt 1901 priv->timer.expires = priv->timerSetAt
1902 + TLAN_TIMER_ACT_DELAY; 1902 + TLAN_TIMER_ACT_DELAY;
1903 spin_unlock_irqrestore(&priv->lock, flags); 1903 spin_unlock_irqrestore(&priv->lock, flags);