diff --git a/[refs] b/[refs] index fb61f2c9a5f4..c19c714b5f60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ede9b52fa911c9a523cf6bc40b5a2b134db957c +refs/heads/master: d8bda9f12d5db160b594ce36659434620e19a363 diff --git a/trunk/drivers/net/wan/dscc4.c b/trunk/drivers/net/wan/dscc4.c index 81c8aec9df92..63a010252a37 100644 --- a/trunk/drivers/net/wan/dscc4.c +++ b/trunk/drivers/net/wan/dscc4.c @@ -1127,7 +1127,7 @@ static int dscc4_open(struct net_device *dev) init_timer(&dpriv->timer); dpriv->timer.expires = jiffies + 10*HZ; dpriv->timer.data = (unsigned long)dev; - dpriv->timer.function = &dscc4_timer; + dpriv->timer.function = dscc4_timer; add_timer(&dpriv->timer); netif_carrier_on(dev);