From dab6df63086762629936e8b89a5984bae39724f6 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 21 Dec 2006 23:06:24 +0100 Subject: [PATCH] Call init_timer() for ISDN PPP CCP reset state timer The function isdn_ppp_ccp_reset_alloc_state() sets ->timer.function and ->timer.data and later on calls add_timer() with no init_timer() ever done. Noted by Al Viro. Signed-off-by: Marcel Holtmann Cc: Al Viro Cc: Karsten Keil Signed-off-by: Linus Torvalds --- drivers/isdn/i4l/isdn_ppp.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/isdn/i4l') diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 1726131b20b..4e3f127e400 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -2339,6 +2339,7 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s rs->state = CCPResetIdle; rs->is = is; rs->id = id; + init_timer(&rs->timer); rs->timer.data = (unsigned long)rs; rs->timer.function = isdn_ppp_ccp_timer_callback; is->reset->rs[id] = rs; -- cgit v1.2.3-18-g5258