From 00a2a67686b48086a2fdd88361470faf189f7af4 Mon Sep 17 00:00:00 2001
From: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Date: Tue, 17 Jul 2007 04:05:00 -0700
Subject: [PATCH] --- yaml --- r: 60854 b: refs/heads/master c:
 ac495bf8971f2dc9d401d892849977e86633ced6 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/rtc/rtc-dev.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2db5a2055aa5..65a7b0cebf23 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a39a49c746adc08488b1403b5aeca1dbd4ce0e2
+refs/heads/master: ac495bf8971f2dc9d401d892849977e86633ced6
diff --git a/trunk/drivers/rtc/rtc-dev.c b/trunk/drivers/rtc/rtc-dev.c
index f4e5f0040ff7..304535942de2 100644
--- a/trunk/drivers/rtc/rtc-dev.c
+++ b/trunk/drivers/rtc/rtc-dev.c
@@ -341,6 +341,8 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file,
 	case RTC_IRQP_READ:
 		if (ops->irq_set_freq)
 			err = put_user(rtc->irq_freq, (unsigned long __user *)uarg);
+		else
+			err = -ENOTTY;
 		break;
 
 	case RTC_IRQP_SET: