diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-09 05:13:01 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-09 05:13:01 +0200 |
| commit | 1043bf5c95cf065c9959c2733d6e868f9806eb66 (patch) | |
| tree | 8272a12e7d6205edc622cce3b28a4f7d0b7bc107 /drivers/rtc/rtc-sh.c | |
| parent | Merge branches 'sh/smp' and 'sh/stable-updates' (diff) | |
| download | linux-1043bf5c95cf065c9959c2733d6e868f9806eb66.tar.xz linux-1043bf5c95cf065c9959c2733d6e868f9806eb66.zip | |
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>
Diffstat (limited to 'drivers/rtc/rtc-sh.c')
| -rw-r--r-- | drivers/rtc/rtc-sh.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index 39a2fcd98c2d..e6ed5404bca0 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; |