From: Paul Mundt <lethal@linux-sh.org>
Date: Wed, 9 Sep 2009 03:13:01 +0000 (+0900)
Subject: rtc: rtc-sh: Fix up oops in early periodic freq assignment.
X-Git-Tag: v2.6.32-rc1~640^2~24
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=1043bf5c95cf065c9959c2733d6e868f9806eb66;p=safe%2Fjmp%2Flinux-2.6

rtc: rtc-sh: Fix up oops in early periodic freq assignment.

With the reordered init order, the rtc device is not registered until
later, while sh_rtc_irq_set_freq() was attempting to assign ->irq_freq
directly, resulting in an oops. This is handled by the upper layers for
us, so just kill off the problematic dereference completely.

Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
index 39a2fcd..e6ed540 100644
--- a/drivers/rtc/rtc-sh.c
+++ b/drivers/rtc/rtc-sh.c
@@ -283,10 +283,8 @@ static int sh_rtc_irq_set_freq(struct device *dev, int freq)
 		ret = -ENOTSUPP;
 	}
 
-	if (ret == 0) {
+	if (ret == 0)
 		rtc->periodic_freq |= tmp;
-		rtc->rtc_dev->irq_freq = freq;
-	}
 
 	spin_unlock_irq(&rtc->lock);
 	return ret;