From 86c7af1ad588900e6642f45286d00c650e5cb8c9 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@igel.co.jp>
Date: Wed, 1 Apr 2009 14:11:07 +0000
Subject: [PATCH] --- yaml --- r: 141815 b: refs/heads/master c:
 3093e78ebab100ada1c724c9f751d9da39602a97 h: refs/heads/master i:   141813:
 b3b9f4dca55edeffaabe605f59ed19a4cea6ed21   141811:
 87fd07cf6a44afe72516f6128a0766a2db4463b1   141807:
 7e56de99b326a91bb3d9861956a77aa0281d2da6 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/clocksource/sh_cmt.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ecaab662e15c..77fadfa93e4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4361bb64b81f5b81a7a08d58654493385a2f2b2
+refs/heads/master: 3093e78ebab100ada1c724c9f751d9da39602a97
diff --git a/trunk/drivers/clocksource/sh_cmt.c b/trunk/drivers/clocksource/sh_cmt.c
index 7783b42f6914..1c92c39a53aa 100644
--- a/trunk/drivers/clocksource/sh_cmt.c
+++ b/trunk/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: