From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
John Stultz <john.stultz@linaro.org>, Ingo Molnar <mingo@elte.hu>,
Ben Greear <greearb@candelatech.com>,
stable@kernel.org
Subject: [patch 1/3] rtc: Handle errors correctly in rtc_irq_set_state()
Date: Fri, 22 Jul 2011 09:12:50 -0000 [thread overview]
Message-ID: <20110722091045.403648377@linutronix.de> (raw)
In-Reply-To: 20110722091011.717194327@linutronix.de
[-- Attachment #1: rtc-deal-with-errors-correctly.patch --]
[-- Type: text/plain, Size: 875 bytes --]
The code checks the correctness of the parameters, but unconditionally
arms/disarms the hrtimer.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@kernel.org
---
drivers/rtc/interface.c | 3 +++
1 file changed, 3 insertions(+)
Index: linux-2.6/drivers/rtc/interface.c
===================================================================
--- linux-2.6.orig/drivers/rtc/interface.c
+++ linux-2.6/drivers/rtc/interface.c
@@ -656,6 +656,8 @@ int rtc_irq_set_state(struct rtc_device
err = -EBUSY;
if (rtc->irq_task != task)
err = -EACCES;
+ if (err)
+ goto out;
if (enabled) {
ktime_t period = ktime_set(0, NSEC_PER_SEC/rtc->irq_freq);
@@ -664,6 +666,7 @@ int rtc_irq_set_state(struct rtc_device
hrtimer_cancel(&rtc->pie_timer);
}
rtc->pie_enabled = enabled;
+out:
spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
return err;
next prev parent reply other threads:[~2011-07-22 9:12 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-22 9:12 [patch 0/3] rtc: Assorted bug fixes Thomas Gleixner
2011-07-22 9:12 ` Thomas Gleixner [this message]
2011-07-22 22:04 ` [patch 1/3] rtc: Handle errors correctly in rtc_irq_set_state() Andrew Morton
2011-07-23 7:15 ` Thomas Gleixner
2011-07-22 9:12 ` [patch 3/3] rtc: Limit frequency Thomas Gleixner
2011-07-22 22:05 ` Andrew Morton
2011-07-22 22:39 ` [stable] " Willy Tarreau
2011-08-05 3:39 ` Joshua Kinard
2011-08-05 9:04 ` John Stultz
2011-08-06 7:28 ` Joshua Kinard
2011-07-23 7:17 ` Thomas Gleixner
2011-07-22 9:12 ` [patch 2/3] rtc: Fix hrtimer deadlock Thomas Gleixner
2011-07-22 22:11 ` Andrew Morton
2011-07-23 7:22 ` Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110722091045.403648377@linutronix.de \
--to=tglx@linutronix.de \
--cc=akpm@linux-foundation.org \
--cc=greearb@candelatech.com \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=stable@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.