diff --git a/[refs] b/[refs] index 5e9ae2daa176..e2e6ebf10b9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e88c17d404c5787afd5bd1763380317f5ccbf84 +refs/heads/master: 222b9f933a76b127a073f45278d2b0199587e8ce diff --git a/trunk/drivers/char/tlclk.c b/trunk/drivers/char/tlclk.c index 4c272189cd42..2546637a55c0 100644 --- a/trunk/drivers/char/tlclk.c +++ b/trunk/drivers/char/tlclk.c @@ -767,6 +767,7 @@ static int __init tlclk_init(void) printk(KERN_ERR "tlclk: can't get major %d.\n", tlclk_major); return ret; } + tlclk_major = ret; alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); if (!alarm_events) goto out1;