Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 108942
b: refs/heads/master
c: 1d96469
h: refs/heads/master
v: v3
  • Loading branch information
Atsushi Nemoto authored and Linus Torvalds committed Aug 20, 2008
1 parent 8d89b80 commit 1a4fa68
Show file tree
Hide file tree
Showing 2 changed files with 5 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: ff9bc512f198eb47204f55b24c6fe3d36ed89592
refs/heads/master: 1d96469a34781340b2cc9bdf97d5913eecdaa038
5 changes: 4 additions & 1 deletion trunk/drivers/rtc/rtc-dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,11 +403,14 @@ static long rtc_dev_ioctl(struct file *file,

#ifdef CONFIG_RTC_INTF_DEV_UIE_EMUL
case RTC_UIE_OFF:
mutex_unlock(&rtc->ops_lock);
clear_uie(rtc);
break;
return 0;

case RTC_UIE_ON:
mutex_unlock(&rtc->ops_lock);
err = set_uie(rtc);
return err;
#endif
default:
err = -ENOTTY;
Expand Down

0 comments on commit 1a4fa68

Please sign in to comment.