projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4cea5ce
)
Char: ds1286, eliminate busy waiting
author
Jiri Slaby
<
[email protected]
>
Thu, 16 Oct 2008 05:04:17 +0000
(22:04 -0700)
committer
Linus Torvalds
<
[email protected]
>
Thu, 16 Oct 2008 18:21:47 +0000
(11:21 -0700)
ds1286_get_time(); is not called from atomic context, sleep for 20 ms is
better choice than a (home-made) busy waiting for such a situation.
Signed-off-by: Jiri Slaby <
[email protected]
>
Acked-by: Ralf Baechle <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
drivers/char/ds1286.c
patch
|
blob
|
history
diff --git
a/drivers/char/ds1286.c
b/drivers/char/ds1286.c
index fb584938c9c3b2eb81bb954a8a8af41fa40fbf00..5329d482b582bd06fff9d4acf66b044683de05e5 100644
(file)
--- a/
drivers/char/ds1286.c
+++ b/
drivers/char/ds1286.c
@@
-443,7
+443,6
@@
static void ds1286_get_time(struct rtc_time *rtc_tm)
{
unsigned char save_control;
unsigned long flags;
- unsigned long uip_watchdog = jiffies;
/*
* read RTC once any update in progress is done. The update
@@
-456,8
+455,7
@@
static void ds1286_get_time(struct rtc_time *rtc_tm)
*/
if (ds1286_is_updating() != 0)
- while (time_before(jiffies, uip_watchdog + 2*HZ/100))
- barrier();
+ msleep(20);
/*
* Only the values that we read from the RTC are set. We leave