From 3929e98f191370ce2d255ceaaf5f723709afa468 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sat, 25 Nov 2006 11:09:27 -0800 Subject: [PATCH] --- yaml --- r: 41073 b: refs/heads/master c: 2601a46474db2dcbc08ee690e56f08a10abe65cb h: refs/heads/master i: 41071: feaca11e60ef81e91a1cf1e140b3c31dfe2603ad v: v3 --- [refs] | 2 +- trunk/drivers/rtc/interface.c | 1 + trunk/drivers/rtc/rtc-dev.c | 13 ++++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 94b290fdafa8..b8cbcef44600 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7531d8faa85f8880db433027bf2b04950e49baeb +refs/heads/master: 2601a46474db2dcbc08ee690e56f08a10abe65cb diff --git a/trunk/drivers/rtc/interface.c b/trunk/drivers/rtc/interface.c index 579cd667b16f..4783ec68fb3c 100644 --- a/trunk/drivers/rtc/interface.c +++ b/trunk/drivers/rtc/interface.c @@ -265,3 +265,4 @@ int rtc_irq_set_freq(struct class_device *class_dev, struct rtc_task *task, int } return err; } +EXPORT_SYMBOL_GPL(rtc_irq_set_freq); diff --git a/trunk/drivers/rtc/rtc-dev.c b/trunk/drivers/rtc/rtc-dev.c index 583789c66cdb..3109865e8d73 100644 --- a/trunk/drivers/rtc/rtc-dev.c +++ b/trunk/drivers/rtc/rtc-dev.c @@ -214,7 +214,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file, struct rtc_wkalrm alarm; void __user *uarg = (void __user *) arg; - /* check that the calles has appropriate permissions + /* check that the calling task has appropriate permissions * for certain ioctls. doing this check here is useful * to avoid duplicate code in each driver. */ @@ -299,6 +299,17 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file, err = rtc_set_time(class_dev, &tm); break; + + case RTC_IRQP_READ: + if (ops->irq_set_freq) + err = put_user(rtc->irq_freq, (unsigned long *) arg); + break; + + case RTC_IRQP_SET: + if (ops->irq_set_freq) + err = rtc_irq_set_freq(class_dev, rtc->irq_task, arg); + break; + #if 0 case RTC_EPOCH_SET: #ifndef rtc_epoch