summaryrefslogtreecommitdiff
path: root/drivers/isdn/mISDN/timerdev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-28 03:19:16 +0300
committerDavid S. Miller <davem@davemloft.net>2009-03-28 03:19:16 +0300
commita83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch)
tree5b5c7c3a56898485479291b7c964a1f3887d469c /drivers/isdn/mISDN/timerdev.c
parentf9384d41c02408dd404aa64d66d0ef38adcf6479 (diff)
parent0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff)
downloadlinux-a83398570e17af6bb81eb94f4f5dd356bd2828d8.tar.xz
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/isdn/mISDN/timerdev.c')
-rw-r--r--drivers/isdn/mISDN/timerdev.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c
index f2b32186d4a1..bbd99d3282c0 100644
--- a/drivers/isdn/mISDN/timerdev.c
+++ b/drivers/isdn/mISDN/timerdev.c
@@ -152,8 +152,7 @@ dev_expire_timer(unsigned long data)
u_long flags;
spin_lock_irqsave(&timer->dev->lock, flags);
- list_del(&timer->list);
- list_add_tail(&timer->list, &timer->dev->expired);
+ list_move_tail(&timer->list, &timer->dev->expired);
spin_unlock_irqrestore(&timer->dev->lock, flags);
wake_up_interruptible(&timer->dev->wait);
}