Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 98848
b: refs/heads/master
c: 61ca9da
h: refs/heads/master
v: v3
  • Loading branch information
Paul Gortmaker authored and Linus Torvalds committed Jul 11, 2008
1 parent dd3a509 commit f0dc5ff
Show file tree
Hide file tree
Showing 2 changed files with 3 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: ac310bb5db057963548e067037d68c9be41d0dd0
refs/heads/master: 61ca9daa2ca3022dc9cb22bd98e69c1b61e412ad
3 changes: 2 additions & 1 deletion trunk/drivers/char/rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,12 +678,13 @@ static int rtc_do_ioctl(unsigned int cmd, unsigned long arg, int kernel)
if (arg != (1<<tmp))
return -EINVAL;

rtc_freq = arg;

spin_lock_irqsave(&rtc_lock, flags);
if (hpet_set_periodic_freq(arg)) {
spin_unlock_irqrestore(&rtc_lock, flags);
return 0;
}
rtc_freq = arg;

val = CMOS_READ(RTC_FREQ_SELECT) & 0xf0;
val |= (16 - tmp);
Expand Down

0 comments on commit f0dc5ff

Please sign in to comment.