Commit 2fc616d1 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] timer fixes

- revert accidental reversion of the timer initialisation in fbcon.

- init a timer in drivers/net/pcmcia/fmvj18x_cs.c
  (OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>)
parent 22d3a67f
...@@ -289,6 +289,7 @@ static dev_link_t *fmvj18x_attach(void) ...@@ -289,6 +289,7 @@ static dev_link_t *fmvj18x_attach(void)
link = &lp->link; dev = &lp->dev; link = &lp->link; dev = &lp->dev;
link->priv = dev->priv = link->irq.Instance = lp; link->priv = dev->priv = link->irq.Instance = lp;
init_timer(&link->release);
link->release.function = &fmvj18x_release; link->release.function = &fmvj18x_release;
link->release.data = (u_long)link; link->release.data = (u_long)link;
......
...@@ -230,9 +230,8 @@ static void fbcon_vbl_detect(int irq, void *dummy, struct pt_regs *fp) ...@@ -230,9 +230,8 @@ static void fbcon_vbl_detect(int irq, void *dummy, struct pt_regs *fp)
static void cursor_timer_handler(unsigned long dev_addr); static void cursor_timer_handler(unsigned long dev_addr);
static struct timer_list cursor_timer = { static struct timer_list cursor_timer =
function: cursor_timer_handler TIMER_INITIALIZER(cursor_timer_handler, 0, 0);
};
static void cursor_timer_handler(unsigned long dev_addr) static void cursor_timer_handler(unsigned long dev_addr)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment