Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 41073
b: refs/heads/master
c: 2601a46
h: refs/heads/master
i:
  41071: feaca11
v: v3
  • Loading branch information
David Brownell authored and Linus Torvalds committed Nov 25, 2006
1 parent da7bd9d commit 3929e98
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7531d8faa85f8880db433027bf2b04950e49baeb
refs/heads/master: 2601a46474db2dcbc08ee690e56f08a10abe65cb
1 change: 1 addition & 0 deletions trunk/drivers/rtc/interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
13 changes: 12 additions & 1 deletion trunk/drivers/rtc/rtc-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3929e98

Please sign in to comment.