---

yaml --- r: 260393 b: refs/heads/master c: 2c4f57d h: refs/heads/master i: 260391: b48386d v: v3
git-mirror · Jul 26, 2011 · 6337325 · 6337325
1 parent 0f1f76c
commit 6337325
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b45d59fb92f60c9c3cda01355d42b907b863e47a
+refs/heads/master: 2c4f57d12df7696d65b0247bfd57fd082a7719e6
diff --git a/trunk/drivers/rtc/interface.c b/trunk/drivers/rtc/interface.c
@@ -656,6 +656,8 @@ int rtc_irq_set_state(struct rtc_device *rtc, struct rtc_task *task, int enabled
 		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 *rtc, struct rtc_task *task, int enabled
 		hrtimer_cancel(&rtc->pie_timer);
 	}
 	rtc->pie_enabled = enabled;
+out:
 	spin_unlock_irqrestore(&rtc->irq_task_lock, flags);
 
 	return err;