Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / drivers / clocksource / sh_cmt.c

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 7783b42f691441c847379f24847f3cf65f31db63..1c92c39a53aaa61cfd1e2a1add78776f4c167a84 100644 (file)
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -465,7 +465,6 @@ static void sh_cmt_register_clockevent(struct sh_cmt_priv *p,
        ced->set_mode = sh_cmt_clock_event_mode;
 
        pr_info("sh_cmt: %s used for clock events\n", ced->name);
-       ced->mult = 1; /* work around misplaced WARN_ON() in clockevents.c */
        clockevents_register_device(ced);
 }
 
@@ -557,7 +556,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev)
                               cfg->clockevent_rating,
                               cfg->clocksource_rating);
  err2:
-       free_irq(irq, p);
+       remove_irq(irq, &p->irqaction);
  err1:
        iounmap(p->mapbase);
  err0: